Tell the caller that the next line needs recomputation, even though it doesn't start...

Fixes: debbugs:10094

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8df4a55b1a80affc614cadc76e9cbb35925704be..386118b51eb421757edac9de8c58db1bca132ec8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation):
+       Tell the caller that the next line needs recomputation, even
+       though it doesn't start a sexp (bug#10094).
+
 2011-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * 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 287bb531538a31cb6c5541f22252bad8ec2788e4..81af2030ebe01ce9d6aad0c33f749180486e75de 100644 (file)
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -159,12 +159,16 @@ is set to `defun'.")
                             (current-column))))
     (goto-char indent-point)
     (beginning-of-line)
-    (cond ((not (extended-loop-p (elt state 1)))
-          (+ loop-indentation lisp-simple-loop-indentation))
-         ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
-          (+ loop-indentation lisp-loop-keyword-indentation))
-         (t
-          (+ loop-indentation lisp-loop-forms-indentation)))))
+    (list
+     (cond ((not (extended-loop-p (elt state 1)))
+           (+ loop-indentation lisp-simple-loop-indentation))
+          ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
+           (+ loop-indentation lisp-loop-keyword-indentation))
+          (t
+           (+ loop-indentation lisp-loop-forms-indentation)))
+     ;; Tell the caller that the next line needs recomputation, even
+     ;; though it doesn't start a sexp.
+     loop-indentation)))
 
 
 ;; Cf (info "(elisp)Specification List")