From 9c34a34446474b0f4bd864d96d95f1faee2e3686 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 21 Nov 2011 22:58:38 +0100 Subject: [PATCH] Tell the caller that the next line needs recomputation, even though it doesn't start a sexp. Fixes: debbugs:10094 --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/cl-indent.el | 16 ++++++++++------ 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 @@ +2011-11-21 Lars Magne Ingebrigtsen + + * 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 * 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'.") (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") -- 2.39.5