diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-06-26 13:04:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-06-26 13:04:28 +0300 |
| commit | ff80437668dd0d5163c9e43f0c200b923b39166b (patch) | |
| tree | db941ef372749df1760363fcc59e0c15ffc11b58 /lisp/emacs-lisp | |
| parent | bde61680abe71059b60a37868a804adf3d819678 (diff) | |
| parent | 1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04 (diff) | |
| download | emacs-ff80437668dd0d5163c9e43f0c200b923b39166b.tar.gz emacs-ff80437668dd0d5163c9e43f0c200b923b39166b.tar.bz2 emacs-ff80437668dd0d5163c9e43f0c200b923b39166b.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | 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 9314419a26f..5134e50fa3b 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) |