(lisp-indent-function): Fix bug:

When delegating, order args in the funcall correctly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e444165a8d68d6d58fe45179904b8eef6a4f590b..625e33d5ea3b5796fa23a5f3c9087baf1d9992df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * emacs-lisp/lisp-mode.el (lisp-indent-function): Fix bug:
+       When delegating, order args in the funcall correctly.
+
 2005-02-01  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 6548a70f7d85681a6db9bb6689babfad533de470..6b5c0b1c0f1ce1737b619045eb50aa554d0c224d 100644 (file)
--- 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
   like ordinary function arguments and then indent any further
   arguments like a body;
 * a function to call just as this function was called.
-If that function returns nil, that means it doesn't specify
-the indentation.
+  If that function returns nil, that means it doesn't specify
+  the indentation.
 
 This function also returns nil meaning don't specify the indentation."
   (let ((normal-indent (current-column)))
@@ -921,7 +921,7 @@ This function also returns nil meaning don't specify the indentation."
               (lisp-indent-specform method state
                                     indent-point normal-indent))
              (method
-               (funcall method state indent-point)))))))
+               (funcall method indent-point state)))))))
 
 (defvar lisp-body-indent 2
   "Number of columns to indent the second line of a `(def...)' form.")