procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Fix null endpos case

Browse source 
Copyright-paperwork-exempt: yes
This commit is contained in:
Graham Dobbins 2017-03-19 21:06:18 -04:00 • committed by Noam Postavsky
parent 3bb5af3a32
commit bcb6c7b7cd
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1083,7 +1083,8 @@ ENDPOS is encountered."
(init-depth (car state)) (init-depth (car state))
(next-depth init-depth) (next-depth init-depth)
(last-depth init-depth) (last-depth init-depth)
(last-syntax-point (point))) (last-syntax-point (point))
(real-endpos endpos))
(unless endpos (unless endpos
;; Get error now if we don't have a complete sexp after point. ;; Get error now if we don't have a complete sexp after point.
(save-excursion (forward-sexp 1) (save-excursion (forward-sexp 1)
@ -1116,6 +1117,8 @@ ENDPOS is encountered."
last-depth (- last-depth next-depth) last-depth (- last-depth next-depth)
next-depth init-depth)) next-depth init-depth))
(forward-line 1) (forward-line 1)
(when (and (not real-endpos) (<= next-depth init-depth))
(goto-char endpos))
(when (< (point) endpos) (when (< (point) endpos)
(let ((depth-delta (- next-depth last-depth))) (let ((depth-delta (- next-depth last-depth)))
(cond ((< depth-delta 0) (cond ((< depth-delta 0)