aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2013-01-15 21:03:06 -0500
committerGlenn Morris2013-01-15 21:03:06 -0500
commitf8a42ad607df01eb47ac758a1601f5a9b1673352 (patch)
treed13cd924f30e8fbedaeddc80afa412e2c79f4502 /lisp
parent827253f7388b3e7ccad021eeedb5bb8674448a16 (diff)
downloademacs-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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efc9521cda2..c2d869ae827 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-01-16 Glenn Morris <rgm@gnu.org> 12013-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."
1148The function `calculate-lisp-indent' calls this to determine 1148The function `calculate-lisp-indent' calls this to determine
1149if the arguments of a Lisp function call should be indented specially. 1149if the arguments of a Lisp function call should be indented specially.
1150 1150
1151INDENT-POINT is the position where the user typed TAB, or equivalent. 1151INDENT-POINT is the position at which the line being indented begins.
1152Point is located at the point to indent under (for default indentation); 1152Point is located at the point to indent under (for default indentation);
1153STATE is the `parse-partial-sexp' state for that position. 1153STATE is the `parse-partial-sexp' state for that position.
1154 1154