Mercurial > emacs
comparison lisp/emacs-lisp/lisp-mode.el @ 59848:d992bb330d29
(lisp-indent-function): Fix bug:
When delegating, order args in the funcall correctly.
| author | Thien-Thi Nguyen <ttn@gnuvola.org> |
|---|---|
| date | Tue, 01 Feb 2005 15:48:50 +0000 |
| parents | e760650016fc |
| children | 65b1f2f4ce8f 72cf6261961e |
comparison
equal
deleted
inserted
replaced
| 59847:1a68a372418d | 59848:d992bb330d29 |
|---|---|
| 882 * `defun', meaning indent `defun'-style; | 882 * `defun', meaning indent `defun'-style; |
| 883 * an integer N, meaning indent the first N arguments specially | 883 * an integer N, meaning indent the first N arguments specially |
| 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. |
| 887 If that function returns nil, that means it doesn't specify | 887 If that function returns nil, that means it doesn't specify |
| 888 the indentation. | 888 the indentation. |
| 889 | 889 |
| 890 This function also returns nil meaning don't specify the indentation." | 890 This function also returns nil meaning don't specify the indentation." |
| 891 (let ((normal-indent (current-column))) | 891 (let ((normal-indent (current-column))) |
| 892 (goto-char (1+ (elt state 1))) | 892 (goto-char (1+ (elt state 1))) |
| 893 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) | 893 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) |
| 919 (lisp-indent-defform state indent-point)) | 919 (lisp-indent-defform state indent-point)) |
| 920 ((integerp method) | 920 ((integerp method) |
| 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.") |
| 928 | 928 |
| 929 (defun lisp-indent-specform (count state indent-point normal-indent) | 929 (defun lisp-indent-specform (count state indent-point normal-indent) |