aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2015-06-26 18:02:30 +0800
committerLeo Liu2015-06-26 18:03:30 +0800
commit1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04 (patch)
tree7851e6804f357a098379f9a8339f74b0b5b44be2
parentf14275633851b047e5aecfa6d12f160ee4c2f149 (diff)
downloademacs-1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04.tar.gz
emacs-1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04.zip
Fix indentation for with-output-to-string
* lisp/emacs-lisp/cl-indent.el: Fix indentation for `with-output-to-string' in elisp. Revert "lisp/emacs-lisp/cl-indent.el: Fix indent of with-output-to-string" This reverts commit 659199f2ca5f283fb246faa78a244e5ca25f53dd.
-rw-r--r--lisp/emacs-lisp/cl-indent.el3
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\
827 (with-accessors . multiple-value-bind) 827 (with-accessors . multiple-value-bind)
828 (with-condition-restarts . multiple-value-bind) 828 (with-condition-restarts . multiple-value-bind)
829 (with-compilation-unit (&lambda &body)) 829 (with-compilation-unit (&lambda &body))
830 (with-output-to-string 0) 830 (with-output-to-string (4 2))
831 (with-slots . multiple-value-bind) 831 (with-slots . multiple-value-bind)
832 (with-standard-io-syntax (2))))) 832 (with-standard-io-syntax (2)))))
833 (dolist (el l) 833 (dolist (el l)
@@ -839,6 +839,7 @@ optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
839;; In elisp, the else part of `if' is in an implicit progn, so indent 839;; In elisp, the else part of `if' is in an implicit progn, so indent
840;; it more. 840;; it more.
841(put 'if 'common-lisp-indent-function-for-elisp 2) 841(put 'if 'common-lisp-indent-function-for-elisp 2)
842(put 'with-output-to-string 'common-lisp-indent-function-for-elisp 0)
842 843
843 844
844;(defun foo (x) 845;(defun foo (x)