diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-11 15:42:13 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-07-11 15:46:06 +0200 |
| commit | a87bdb8f91263c3ebe1903b82b15cd148ab09da5 (patch) | |
| tree | a51d1cd7a8925049ed53a3fc78e9be63f017ad7a | |
| parent | 60fc771ac6f090e4e44339cb6d0232a852580ee2 (diff) | |
| download | emacs-a87bdb8f91263c3ebe1903b82b15cd148ab09da5.tar.gz | |
Fix C-x C-e with defvars in comments preceding
* lisp/progmodes/elisp-mode.el (eval-sexp-add-defvars): When
collecting defvars in the current buffer, ignore the ones that are
in comments or strings (bug#34233).
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index cb1b17b4474..ae09bfc0224 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1179,7 +1179,11 @@ POS specifies the starting position where EXP was found and defaults to point." (let ((var (intern (match-string 1)))) (and (not (special-variable-p var)) (save-excursion - (zerop (car (syntax-ppss (match-beginning 0))))) + (let ((syntax (syntax-ppss (match-beginning 0)))) + ;; Top-level. + (and (zerop (car syntax)) + ;; Not in a comment or string. + (null (nth 8 syntax))))) (push var vars)))) `(progn ,@(mapcar (lambda (v) `(defvar ,v)) vars) ,exp))))) |