From f8a42ad607df01eb47ac758a1601f5a9b1673352 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 21:03:06 -0500 Subject: [PATCH] Doc fixes related to "(declare (indent symbol))" (bug#13450) * doc/lispref/macros.texi (Indenting Macros): Fix order of an indent symbol's arguments. * lisp/emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/macros.texi | 4 ++-- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/lisp-mode.el | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 59361318ae..8a35dd6d4b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2013-01-16 Glenn Morris + + * macros.texi (Indenting Macros): Fix order of an indent + symbol's arguments. (Bug#13450) + 2013-01-09 Glenn Morris * commands.texi (Interactive Codes): diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index 9ad00ca026..5520bbbd1d 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -606,12 +606,12 @@ calculate the indentation of a line within this expression. The function receives two arguments: @table @asis +@item @var{pos} +The position at which the line being indented begins. @item @var{state} The value returned by @code{parse-partial-sexp} (a Lisp primitive for indentation and nesting computation) when it parses up to the beginning of this line. -@item @var{pos} -The position at which the line being indented begins. @end table @noindent diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efc9521cda..c2d869ae82 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-01-16 Glenn Morris + * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Revert 2012-12-29 change. Ref: diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index a68c727aab..fc1cfe7afd 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1148,7 +1148,7 @@ is the buffer position of the start of the containing expression." The function `calculate-lisp-indent' calls this to determine if the arguments of a Lisp function call should be indented specially. -INDENT-POINT is the position where the user typed TAB, or equivalent. +INDENT-POINT is the position at which the line being indented begins. Point is located at the point to indent under (for default indentation); STATE is the `parse-partial-sexp' state for that position. -- 2.39.2