mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 00:00:39 -08:00
Code Issues Projects Releases Wiki Activity

(indent-sexp): Clean up termination condition -- don't fail to stop at endpos.

Browse source
This commit is contained in:
Richard M. Stallman 2007-02-11 11:12:20 +00:00
parent 531309ebc8
commit 9f25c0d219
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/emacs-lisp/lisp-mode.el
View file

@ -1130,19 +1130,25 @@ ENDPOS is encountered."
(make-list (- next-depth) nil))
last-depth (- last-depth next-depth)
next-depth 0)))
(or outer-loop-done endpos
(setq outer-loop-done (<= next-depth 0)))
(if outer-loop-done
(forward-line 1)
(forward-line 1)
;; Decide whether to exit.
(if endpos
;; If we have already reached the specified end,
;; give up and do not reindent this line.
(if (<= endpos (point))
(setq outer-loop-done t))
;; If no specified end, we are done if we have finished one sexp.
(if (<= next-depth 0)
(setq outer-loop-done t)))
(unless outer-loop-done
(while (> last-depth next-depth)
(setq indent-stack (cdr indent-stack)
last-depth (1- last-depth)))
(while (< last-depth next-depth)
(setq indent-stack (cons nil indent-stack)
last-depth (1+ last-depth)))
;; Now go to the next line and indent it according
;; Now indent the next line according
;; to what we learned from parsing the previous one.
(forward-line 1)
(setq bol (point))
(skip-chars-forward " \t")
;; But not if the line is blank, or just a comment