[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/lisp-mode.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/06/22 06:24:37

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: lisp-mode.el 

Log message:
        (lisp-indent-offset): Fix safe-local-variable property.
        (lisp-indent-function): Make it a defcustom.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15704&r2=1.15705
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp-mode.el?cvsroot=emacs&r1=1.240&r2=1.241

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15704
retrieving revision 1.15705
diff -u -b -r1.15704 -r1.15705
--- ChangeLog   21 Jun 2009 14:35:28 -0000      1.15704
+++ ChangeLog   22 Jun 2009 06:24:32 -0000      1.15705
@@ -1,3 +1,9 @@
+2009-06-22  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/gdb-ui.el: Replace with ...

Index: emacs-lisp/lisp-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp-mode.el,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- emacs-lisp/lisp-mode.el     21 Jun 2009 01:39:46 -0000      1.240
+++ emacs-lisp/lisp-mode.el     22 Jun 2009 06:24:36 -0000      1.241
@@ -877,15 +877,17 @@
   "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.