[Emacs-diffs] master ff80437 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit ff80437668dd0d5163c9e43f0c200b923b39166b
Merge: bde6168 1546c6f
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/emacs-lisp/cl-indent.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 9314419..5134e50 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -827,7 +827,7 @@ 
optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
            (with-accessors . multiple-value-bind)
            (with-condition-restarts . multiple-value-bind)
           (with-compilation-unit (&lambda &body))
-           (with-output-to-string 0)
+           (with-output-to-string (4 2))
            (with-slots . multiple-value-bind)
            (with-standard-io-syntax (2)))))
   (dolist (el l)
@@ -839,6 +839,7 @@ 
optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
 ;; In elisp, the else part of `if' is in an implicit progn, so indent
 ;; it more.
 (put 'if 'common-lisp-indent-function-for-elisp 2)
+(put 'with-output-to-string 'common-lisp-indent-function-for-elisp 0)
 
 
 ;(defun foo (x)