(lisp-indent-offset): Make defcustom. Add `safe-local-variable' property.

(lisp-body-indent): Likewise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ccf0fa4f62438b491228ebde9837c26fbe0c8224..b0e3448aaca4bc0e5028420f5d16c5a1f2fadf65 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-02  Richard Stallman  <rms@gnu.org>
+
+       * emacs-lisp/lisp-mode.el (lisp-indent-offset): Make defcustom.
+       Add `safe-local-variable' property.
+       (lisp-body-indent): Likewise.
+
 2007-09-02  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * info.el (info-tool-bar-map): Add :rtl keyword to right/left-arrow and

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 8b3e5a71c61a709a253c051538e1d45ec041d9a0..846e3fce55a99fcc76ccaa2cbfd3d15163b55462 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -783,8 +783,13 @@ which see."
          (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)
@@ -1024,8 +1029,11 @@ This function also returns nil meaning don't specify the indentation."
              (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))