diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-07-24 06:40:58 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-07-24 06:40:58 -0700 |
| commit | 64f94785c7ef76de160649054ec970f62af49472 (patch) | |
| tree | b35f018eed0daab3427cf240b32770a7b264f713 /lisp/emacs-lisp/lisp-mode.el | |
| parent | 8c6a50230eda7a0773dcf0e6530d064e28df357c (diff) | |
| parent | f64c2774e96c755a5fddcbc49db65dcc3fcb9323 (diff) | |
| download | emacs-64f94785c7ef76de160649054ec970f62af49472.tar.gz emacs-64f94785c7ef76de160649054ec970f62af49472.tar.bz2 emacs-64f94785c7ef76de160649054ec970f62af49472.zip | |
Merge from origin/emacs-26
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
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 4e5b1a7e4ff..25b61a23a94 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -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))) |