aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/emacs-lisp/lisp-mode.el7
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d1dd7efc1b..f802d7bb018 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
12009-06-21 Glenn Morris <rgm@gnu.org> 12009-06-21 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/lisp-mode.el (lisp-indent-function)
3 * emacs-lisp/cl-indent.el (lisp-indent-defun-method) 4 * emacs-lisp/cl-indent.el (lisp-indent-defun-method)
4 (common-lisp-indent-function): Add doc strings. 5 (common-lisp-indent-function): Add doc strings.
5 6
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 45ed753d37b..ec97a00ab0c 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -880,7 +880,12 @@ which see."
880(put 'lisp-body-indent 'safe-local-variable 880(put 'lisp-body-indent 'safe-local-variable
881 (lambda (x) (or (null x) (integerp x)))) 881 (lambda (x) (or (null x) (integerp x))))
882 882
883(defvar lisp-indent-function 'lisp-indent-function) 883(defvar lisp-indent-function 'lisp-indent-function
884 "A function to be called by `calculate-lisp-indent'.
885It indents the arguments of a Lisp function call. This function
886should accept two arguments: the indent-point, and the
887`parse-partial-sexp' state at that position. One option for this
888function is `common-lisp-indent-function'.")
884 889
885(defun lisp-indent-line (&optional whole-exp) 890(defun lisp-indent-line (&optional whole-exp)
886 "Indent current line as Lisp code. 891 "Indent current line as Lisp code.