Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

This commit is contained in:
Glenn Morris 2013-01-19 12:38:13 -08:00
commit 795e7a5b32
14 changed files with 72 additions and 24 deletions

View file

@ -1156,7 +1156,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.