diff options
| author | akater <nuclearspace@gmail.com> | 2021-11-08 07:37:51 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-11-08 07:38:41 +0100 |
| commit | ca9fb109f75565dce7ba527f273cebc16887287e (patch) | |
| tree | 9e388d05ce8e7fb3c6d4d4606fce1118218cff5b | |
| parent | 51aa6cee2cb6eee48f62e3efe96f27a0d844e67d (diff) | |
| download | emacs-ca9fb109f75565dce7ba527f273cebc16887287e.tar.gz | |
lisp/emacs-lisp/lisp-mode.el: Fix parser state corruption.
* lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): Preserve
the point.
* test/lisp/progmodes/elisp-mode-resources/flet.erts: Add corresponding
test example (bug#9622).
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 13 | ||||
| -rw-r--r-- | test/lisp/progmodes/elisp-mode-resources/flet.erts | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 15afdef0252..a5613e70e0a 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1148,12 +1148,13 @@ STATE is the `parse-partial-sexp' state for current position." ;; that starts a sexp. t) (point)))))) - (ignore-errors - ;; We rely on `backward-up-list' working - ;; even when sexp is incomplete “to the right”. - (backward-up-list 2) - t) - (= local-definitions-starting-point (point)))))))) + (save-excursion + (ignore-errors + ;; We rely on `backward-up-list' working + ;; even when sexp is incomplete “to the right”. + (backward-up-list 2) + t) + (= local-definitions-starting-point (point))))))))) (defun lisp-indent-function (indent-point state) "This function is the normal value of the variable `lisp-indent-function'. diff --git a/test/lisp/progmodes/elisp-mode-resources/flet.erts b/test/lisp/progmodes/elisp-mode-resources/flet.erts index 7c4a0f304e9..da3dcb6ec3e 100644 --- a/test/lisp/progmodes/elisp-mode-resources/flet.erts +++ b/test/lisp/progmodes/elisp-mode-resources/flet.erts @@ -221,6 +221,16 @@ Name: flet15 i))) =-=-= +Name: flet16 + +=-= +(cl-flet ((f (x) + (g x))) + (pcase e + ((dangerous-expression) + (form)))) +=-=-= + Name: flet-indentation-incomplete-sexp-no-side-effects-1 Code: (lambda () (emacs-lisp-mode) (setq indent-tabs-mode nil) (newline nil t)) Point-Char: | |