[Emacs-diffs] /srv/bzr/emacs/trunk r106466: Tell the caller that the next line needs recomputation, even though it doesn't start a sexp.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 106466
fixes bug(s): http://debbugs.gnu.org/10094
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-21 22:58:38 +0100
message:
  Tell the caller that the next line needs recomputation, even though it 
doesn't start a sexp.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-indent.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-21 14:22:02 +0000
+++ b/lisp/ChangeLog    2011-11-21 21:58:38 +0000
@@ -1,3 +1,9 @@
+2011-11-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Simplify.

=== modified file 'lisp/emacs-lisp/cl-indent.el'
--- a/lisp/emacs-lisp/cl-indent.el      2011-09-13 06:55:10 +0000
+++ b/lisp/emacs-lisp/cl-indent.el      2011-11-21 21:58:38 +0000
@@ -159,12 +159,16 @@
                             (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")