aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-11-21 22:58:38 +0100
committerLars Magne Ingebrigtsen2011-11-21 22:58:38 +0100
commit9c34a34446474b0f4bd864d96d95f1faee2e3686 (patch)
tree25a2aa40d0ac697b1c9f235499fa47a184dafd5a
parent16c1ad08dc0899e6d88971cb08ddc5d6c8fbccef (diff)
downloademacs-9c34a34446474b0f4bd864d96d95f1faee2e3686.tar.gz
emacs-9c34a34446474b0f4bd864d96d95f1faee2e3686.zip
Tell the caller that the next line needs recomputation, even though it doesn't start a sexp.
Fixes: debbugs:10094
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/emacs-lisp/cl-indent.el16
2 files changed, 16 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8df4a55b1a8..386118b51eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation):
4 Tell the caller that the next line needs recomputation, even
5 though it doesn't start a sexp (bug#10094).
6
12011-11-21 Stefan Monnier <monnier@iro.umontreal.ca> 72011-11-21 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify. 9 * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 287bb531538..81af2030ebe 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -159,12 +159,16 @@ is set to `defun'.")
159 (current-column)))) 159 (current-column))))
160 (goto-char indent-point) 160 (goto-char indent-point)
161 (beginning-of-line) 161 (beginning-of-line)
162 (cond ((not (extended-loop-p (elt state 1))) 162 (list
163 (+ loop-indentation lisp-simple-loop-indentation)) 163 (cond ((not (extended-loop-p (elt state 1)))
164 ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)") 164 (+ loop-indentation lisp-simple-loop-indentation))
165 (+ loop-indentation lisp-loop-keyword-indentation)) 165 ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
166 (t 166 (+ loop-indentation lisp-loop-keyword-indentation))
167 (+ loop-indentation lisp-loop-forms-indentation))))) 167 (t
168 (+ loop-indentation lisp-loop-forms-indentation)))
169 ;; Tell the caller that the next line needs recomputation, even
170 ;; though it doesn't start a sexp.
171 loop-indentation)))
168 172
169 173
170;; Cf (info "(elisp)Specification List") 174;; Cf (info "(elisp)Specification List")