From: Glenn Morris <rgm@gnu.org>
Date: Wed, 16 Jan 2013 02:03:06 +0000 (-0500)
Subject: Doc fixes related to "(declare (indent symbol))" (bug#13450)
X-Git-Tag: emacs-24.2.93~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8a42ad607df01eb47ac758a1601f5a9b1673352;p=emacs.git

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.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 59361318ae3..8a35dd6d4bb 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-16  Glenn Morris  <rgm@gnu.org>
+
+	* macros.texi (Indenting Macros): Fix order of an indent
+	symbol's arguments.  (Bug#13450)
+
 2013-01-09  Glenn Morris  <rgm@gnu.org>
 
 	* commands.texi (Interactive Codes):
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 9ad00ca0260..5520bbbd1df 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 efc9521cda2..c2d869ae827 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-01-16  Glenn Morris  <rgm@gnu.org>
 
+	* emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.
+
 	* mail/rmailmm.el (rmail-insert-mime-forwarded-message):
 	Revert 2012-12-29 change.  Ref:
 	<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00360.html>
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index a68c727aaba..fc1cfe7afd1 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.