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

Be more careful about indent-sexp going over eol (Bug#35286)

Browse source 
* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple
sexps if the end of line is within a sexp.
* test/lisp/emacs-lisp/lisp-mode-tests.el
(indent-sexp-stop-before-eol-comment)
(indent-sexp-stop-before-eol-non-lisp): New tests.
This commit is contained in:
Noam Postavsky 2019-04-15 18:49:57 -04:00
parent 3988e93d4b
commit 93912baefd
2 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1205,19 +1205,25 @@ ENDPOS is encountered."
;; Get error now if we don't have a complete sexp
;; after point.
(save-excursion
(forward-sexp 1)
(let ((eol (line-end-position)))
(forward-sexp 1)
;; We actually look for a sexp which ends
;; after the current line so that we properly
;; indent things like #s(...). This might not
;; be needed if Bug#15998 is fixed.
(condition-case ()
(while (and (< (point) eol) (not (eobp)))
(forward-sexp 1))
;; But don't signal an error for incomplete
;; sexps following the first complete sexp
;; after point.
(scan-error nil)))
(when (and (< (point) eol)
;; Check if eol is within a sexp.
(> (nth 0 (save-excursion
(parse-partial-sexp
(point) eol)))
0))
(condition-case ()
(while (< (point) eol)
(forward-sexp 1))
;; But don't signal an error for incomplete
;; sexps following the first complete sexp
;; after point.
(scan-error nil))))
(point)))))
(save-excursion
(while (let ((indent (lisp-indent-calc-next parse-state))