Commit 4fd99ee4 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(c-indent-region): When looking for a sexp that ends

past this line, make sure it really starts on this line.
parent 4baf5620
......@@ -1189,7 +1189,7 @@ If within a string or comment, move by sentences instead of statements."
(while (and (bolp) (not (eolp)))
;; Indent one line as with TAB.
(let ((shift-amt (c-indent-line))
nextline sexpend)
nextline sexpbeg sexpend)
(save-excursion
;; Find beginning of following line.
(save-excursion
......@@ -1203,10 +1203,16 @@ If within a string or comment, move by sentences instead of statements."
(setq sexpend (point-marker)))
(error (setq sexpend nil)
(goto-char nextline)))
(skip-chars-forward " \t\n")))
(skip-chars-forward " \t\n"))
;; Make sure the sexp we found really starts on the
;; current line and extends past it.
(goto-char sexpend)
(backward-sexp 1)
(setq sexpbeg (point)))
;; If that sexp ends within the region,
;; indent it all at once, fast.
(if (and sexpend (> sexpend nextline) (<= sexpend endmark))
(if (and sexpend (> sexpend nextline) (<= sexpend endmark)
(< sexpbeg nextline))
(progn
(indent-c-exp)
(goto-char sexpend)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment