diff options
| author | Glenn Morris | 2013-01-15 21:03:06 -0500 |
|---|---|---|
| committer | Glenn Morris | 2013-01-15 21:03:06 -0500 |
| commit | f8a42ad607df01eb47ac758a1601f5a9b1673352 (patch) | |
| tree | d13cd924f30e8fbedaeddc80afa412e2c79f4502 | |
| parent | 827253f7388b3e7ccad021eeedb5bb8674448a16 (diff) | |
| download | emacs-f8a42ad607df01eb47ac758a1601f5a9b1673352.tar.gz emacs-f8a42ad607df01eb47ac758a1601f5a9b1673352.zip | |
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.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/macros.texi | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | 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 59361318ae3..8a35dd6d4bb 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-16 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * macros.texi (Indenting Macros): Fix order of an indent | ||
| 4 | symbol's arguments. (Bug#13450) | ||
| 5 | |||
| 1 | 2013-01-09 Glenn Morris <rgm@gnu.org> | 6 | 2013-01-09 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * commands.texi (Interactive Codes): | 8 | * 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 | |||
| 606 | function receives two arguments: | 606 | function receives two arguments: |
| 607 | 607 | ||
| 608 | @table @asis | 608 | @table @asis |
| 609 | @item @var{pos} | ||
| 610 | The position at which the line being indented begins. | ||
| 609 | @item @var{state} | 611 | @item @var{state} |
| 610 | The value returned by @code{parse-partial-sexp} (a Lisp primitive for | 612 | The value returned by @code{parse-partial-sexp} (a Lisp primitive for |
| 611 | indentation and nesting computation) when it parses up to the | 613 | indentation and nesting computation) when it parses up to the |
| 612 | beginning of this line. | 614 | beginning of this line. |
| 613 | @item @var{pos} | ||
| 614 | The position at which the line being indented begins. | ||
| 615 | @end table | 615 | @end table |
| 616 | 616 | ||
| 617 | @noindent | 617 | @noindent |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efc9521cda2..c2d869ae827 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-01-16 Glenn Morris <rgm@gnu.org> | 1 | 2013-01-16 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. | ||
| 4 | |||
| 3 | * mail/rmailmm.el (rmail-insert-mime-forwarded-message): | 5 | * mail/rmailmm.el (rmail-insert-mime-forwarded-message): |
| 4 | Revert 2012-12-29 change. Ref: | 6 | Revert 2012-12-29 change. Ref: |
| 5 | <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00360.html> | 7 | <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." | |||
| 1148 | The function `calculate-lisp-indent' calls this to determine | 1148 | The function `calculate-lisp-indent' calls this to determine |
| 1149 | if the arguments of a Lisp function call should be indented specially. | 1149 | if the arguments of a Lisp function call should be indented specially. |
| 1150 | 1150 | ||
| 1151 | INDENT-POINT is the position where the user typed TAB, or equivalent. | 1151 | INDENT-POINT is the position at which the line being indented begins. |
| 1152 | Point is located at the point to indent under (for default indentation); | 1152 | Point is located at the point to indent under (for default indentation); |
| 1153 | STATE is the `parse-partial-sexp' state for that position. | 1153 | STATE is the `parse-partial-sexp' state for that position. |
| 1154 | 1154 | ||