(lisp-indent-offset): Fix safe-local-variable property.

(lisp-indent-function): Make it a defcustom.

2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6d2e331cb..6265733a15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-22  Glenn Morris  <[email protected]>
+
+	* emacs-lisp/lisp-mode.el (lisp-indent-offset): Fix safe-local-variable
+	property.
+	(lisp-indent-function): Make it a defcustom.
+
 2009-06-21  Nick Roberts  <[email protected]>
 
 	* progmodes/gdb-ui.el: Replace with ...
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index ec97a00ab0..9845d304c8 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -877,15 +877,17 @@ which see."
   "If non-nil, indent second line of expressions that many more columns."
   :group 'lisp
   :type '(choice (const nil) integer))
-(put 'lisp-body-indent 'safe-local-variable
+(put 'lisp-indent-offset 'safe-local-variable
      (lambda (x) (or (null x) (integerp x))))
 
-(defvar lisp-indent-function 'lisp-indent-function
+(defcustom lisp-indent-function 'lisp-indent-function
   "A function to be called by `calculate-lisp-indent'.
 It indents the arguments of a Lisp function call.  This function
 should accept two arguments: the indent-point, and the
 `parse-partial-sexp' state at that position.  One option for this
-function is `common-lisp-indent-function'.")
+function is `common-lisp-indent-function'."
+  :type 'function
+  :group 'lisp)
 
 (defun lisp-indent-line (&optional whole-exp)
   "Indent current line as Lisp code.