Mercurial > emacs
diff 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 (2007-10-09) |
| parents | bfafceb8e3dd 7191ad0f348d |
| children | 107ccd98fa12 bdb3fe0ba9fa |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp-mode.el Tue Oct 09 08:44:02 2007 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Tue Oct 09 08:52:57 2007 +0000 @@ -784,8 +784,13 @@ (let ((comment-start nil) (comment-start-skip nil)) (do-auto-fill)))))) -(defvar lisp-indent-offset nil - "If non-nil, indent second line of expressions that many more columns.") +(defcustom lisp-indent-offset nil + "If non-nil, indent second line of expressions that many more columns." + :group 'lisp + :type '(choice nil integer)) +(put 'lisp-body-indent 'safe-local-variable + (lambda (x) (or (null x) (integerp x)))) + (defvar lisp-indent-function 'lisp-indent-function) (defun lisp-indent-line (&optional whole-exp) @@ -1025,8 +1030,11 @@ (method (funcall method indent-point state))))))) -(defvar lisp-body-indent 2 - "Number of columns to indent the second line of a `(def...)' form.") +(defcustom lisp-body-indent 2 + "Number of columns to indent the second line of a `(def...)' form." + :group 'lisp + :type 'integer) +(put 'lisp-body-indent 'safe-local-variable 'integerp) (defun lisp-indent-specform (count state indent-point normal-indent) (let ((containing-form-start (elt state 1))