Mercurial > emacs
comparison lisp/emacs-lisp/lisp-mode.el @ 85114:5039706521c9
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 09 Oct 2007 08:52:57 +0000 |
| parents | bfafceb8e3dd 7191ad0f348d |
| children | 107ccd98fa12 bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
| 85113:82b4a12fd080 | 85114:5039706521c9 |
|---|---|
| 782 (unless (and (boundp 'comment-auto-fill-only-comments) | 782 (unless (and (boundp 'comment-auto-fill-only-comments) |
| 783 comment-auto-fill-only-comments) | 783 comment-auto-fill-only-comments) |
| 784 (let ((comment-start nil) (comment-start-skip nil)) | 784 (let ((comment-start nil) (comment-start-skip nil)) |
| 785 (do-auto-fill)))))) | 785 (do-auto-fill)))))) |
| 786 | 786 |
| 787 (defvar lisp-indent-offset nil | 787 (defcustom lisp-indent-offset nil |
| 788 "If non-nil, indent second line of expressions that many more columns.") | 788 "If non-nil, indent second line of expressions that many more columns." |
| 789 :group 'lisp | |
| 790 :type '(choice nil integer)) | |
| 791 (put 'lisp-body-indent 'safe-local-variable | |
| 792 (lambda (x) (or (null x) (integerp x)))) | |
| 793 | |
| 789 (defvar lisp-indent-function 'lisp-indent-function) | 794 (defvar lisp-indent-function 'lisp-indent-function) |
| 790 | 795 |
| 791 (defun lisp-indent-line (&optional whole-exp) | 796 (defun lisp-indent-line (&optional whole-exp) |
| 792 "Indent current line as Lisp code. | 797 "Indent current line as Lisp code. |
| 793 With argument, indent any additional lines of the same expression | 798 With argument, indent any additional lines of the same expression |
| 1023 (lisp-indent-specform method state | 1028 (lisp-indent-specform method state |
| 1024 indent-point normal-indent)) | 1029 indent-point normal-indent)) |
| 1025 (method | 1030 (method |
| 1026 (funcall method indent-point state))))))) | 1031 (funcall method indent-point state))))))) |
| 1027 | 1032 |
| 1028 (defvar lisp-body-indent 2 | 1033 (defcustom lisp-body-indent 2 |
| 1029 "Number of columns to indent the second line of a `(def...)' form.") | 1034 "Number of columns to indent the second line of a `(def...)' form." |
| 1035 :group 'lisp | |
| 1036 :type 'integer) | |
| 1037 (put 'lisp-body-indent 'safe-local-variable 'integerp) | |
| 1030 | 1038 |
| 1031 (defun lisp-indent-specform (count state indent-point normal-indent) | 1039 (defun lisp-indent-specform (count state indent-point normal-indent) |
| 1032 (let ((containing-form-start (elt state 1)) | 1040 (let ((containing-form-start (elt state 1)) |
| 1033 (i count) | 1041 (i count) |
| 1034 body-indent containing-form-column) | 1042 body-indent containing-form-column) |