aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-02-01 15:50:46 +0000
committerThien-Thi Nguyen2005-02-01 15:50:46 +0000
commitcc08f5b25368d2113b7346bd2701535de48d9967 (patch)
tree060231e9ebf73216890b18c71789b086abf4225d
parentb961eb0e9896443e57a18e5d59d7227ce158079c (diff)
downloademacs-cc08f5b25368d2113b7346bd2701535de48d9967.tar.gz
emacs-cc08f5b25368d2113b7346bd2701535de48d9967.zip
(lisp-indent-function): Fix bug:
When delegating, order args in the funcall correctly.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/lisp-mode.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e444165a8d6..625e33d5ea3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12005-02-01 Thien-Thi Nguyen <ttn@gnu.org> 12005-02-01 Thien-Thi Nguyen <ttn@gnu.org>
2 2
3 * emacs-lisp/lisp-mode.el (lisp-indent-function): Fix bug:
4 When delegating, order args in the funcall correctly.
5
62005-02-01 Thien-Thi Nguyen <ttn@gnu.org>
7
3 * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. 8 * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.
4 9
52005-02-01 Carsten Dominik <dominik@science.uva.nl> 102005-02-01 Carsten Dominik <dominik@science.uva.nl>
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 6548a70f7d8..6b5c0b1c0f1 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -884,8 +884,8 @@ that specifies how to do the indentation. The property value can be
884 like ordinary function arguments and then indent any further 884 like ordinary function arguments and then indent any further
885 arguments like a body; 885 arguments like a body;
886* a function to call just as this function was called. 886* a function to call just as this function was called.
887If that function returns nil, that means it doesn't specify 887 If that function returns nil, that means it doesn't specify
888the indentation. 888 the indentation.
889 889
890This function also returns nil meaning don't specify the indentation." 890This function also returns nil meaning don't specify the indentation."
891 (let ((normal-indent (current-column))) 891 (let ((normal-indent (current-column)))
@@ -921,7 +921,7 @@ This function also returns nil meaning don't specify the indentation."
921 (lisp-indent-specform method state 921 (lisp-indent-specform method state
922 indent-point normal-indent)) 922 indent-point normal-indent))
923 (method 923 (method
924 (funcall method state indent-point))))))) 924 (funcall method indent-point state)))))))
925 925
926(defvar lisp-body-indent 2 926(defvar lisp-body-indent 2
927 "Number of columns to indent the second line of a `(def...)' form.") 927 "Number of columns to indent the second line of a `(def...)' form.")