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

Merge from origin/emacs-26

Browse source 
f64c277 (origin/emacs-26) Let bookmark-jump override window-point (Bu...
1208aaa Omit keymap from subword-mode docstring (Bug#32212)
2b70b54 Prevent line-mode term from showing user passwords
5de4441 Check for special filenames in eshell (Bug#30724)
1b4b965 Fix indent-sexp of #s(...) (Bug#31984)
59e8533 Add save-match-data to abbreviate-file-name (Bug#32201)
47f75b1 Fix last change in editfns.c
671dc5a Fix calls to buffer modification hooks from replace-buffer-co...
cc4ceed ; etc/NEWS: Remove unnecessary reference to a bug number.
e0f33ea Fix Bug#32226
7308fa0 Improve doc strings of several variables in keyboard.c
This commit is contained in:
Glenn Morris 2018-07-24 06:40:58 -07:00
commit 64f94785c7
16 changed files with 110 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1195,8 +1195,14 @@ ENDPOS is encountered."
(setq endpos (copy-marker
(if endpos endpos
;; Get error now if we don't have a complete sexp
;; after point.
(save-excursion (forward-sexp 1) (point)))))
;; after point. 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.
(let ((eol (line-end-position)))
(save-excursion (while (and (< (point) eol) (not (eobp)))
(forward-sexp 1))
(point))))))
(save-excursion
(while (let ((indent (lisp-indent-calc-next parse-state))
(ppss (lisp-indent-state-ppss parse-state)))