diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-07-19 06:40:54 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-07-21 21:07:07 -0400 |
| commit | 1b4b96597c7868d9c24389d83089097a521206a5 (patch) | |
| tree | dd9f8556ba019a88b8fd11c250ff592f831fdab3 | |
| parent | 59e8533286cc8b5abc80b0966ef4b9fb676fbdfe (diff) | |
| download | emacs-1b4b96597c7868d9c24389d83089097a521206a5.tar.gz | |
Fix indent-sexp of #s(...) (Bug#31984)
* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Look for a sexp that
ends after the current line.
* test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-go): New test.
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 10 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/lisp-mode-tests.el | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 3a03b56313d..44b27236a9c 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1199,8 +1199,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))) diff --git a/test/lisp/emacs-lisp/lisp-mode-tests.el b/test/lisp/emacs-lisp/lisp-mode-tests.el index 8598d419788..0b052e9fc30 100644 --- a/test/lisp/emacs-lisp/lisp-mode-tests.el +++ b/test/lisp/emacs-lisp/lisp-mode-tests.el @@ -113,6 +113,18 @@ noindent\" 3 ;; we're indenting ends on the previous line. (should (equal (buffer-string) original))))) +(ert-deftest indent-sexp-go () + "Make sure `indent-sexp' doesn't stop after #s." + ;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31984. + (with-temp-buffer + (emacs-lisp-mode) + (insert "#s(foo\nbar)\n") + (goto-char (point-min)) + (indent-sexp) + (should (equal (buffer-string) "\ +#s(foo + bar)\n")))) + (ert-deftest lisp-indent-region () "Test basics of `lisp-indent-region'." (with-temp-buffer |