# HG changeset patch # User Glenn Morris # Date 1245651872 0 # Node ID ce2fc4a55d15870ee343ff0868d2fd8064be4907 # Parent 995efe4ff12361115fcd92148b96672236b2f0e1 (lisp-indent-offset): Fix safe-local-variable property. (lisp-indent-function): Make it a defcustom. diff -r 995efe4ff123 -r ce2fc4a55d15 lisp/ChangeLog --- a/lisp/ChangeLog Mon Jun 22 04:09:14 2009 +0000 +++ b/lisp/ChangeLog Mon Jun 22 06:24:32 2009 +0000 @@ -1,3 +1,9 @@ +2009-06-22 Glenn Morris + + * 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 * progmodes/gdb-ui.el: Replace with ... diff -r 995efe4ff123 -r ce2fc4a55d15 lisp/emacs-lisp/lisp-mode.el --- a/lisp/emacs-lisp/lisp-mode.el Mon Jun 22 04:09:14 2009 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Mon Jun 22 06:24:32 2009 +0000 @@ -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.