summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-10-14 22:00:20 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-10-14 22:00:20 -0400
commit6d81466ac65eb84cb77eaa73e589628b5afcb963 (patch)
tree3e1e8fe0652c104f52412e8f753615f76bfb06ba /lisp/emacs-lisp
parente01955dfb3f1f47a11c9f1f907ef9234987f47d4 (diff)
downloademacs-6d81466ac65eb84cb77eaa73e589628b5afcb963.tar.gz
emacs-6d81466ac65eb84cb77eaa73e589628b5afcb963.tar.bz2
emacs-6d81466ac65eb84cb77eaa73e589628b5afcb963.zip
* lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
Backported. Fixes: debbugs:18688
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/lisp.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 80366db33d5..a7de1bd255e 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -711,6 +711,7 @@ considered."
(`(condition-case ,v ,_ . ,catches)
(lisp--local-variables-1
(cons v vars) (cdr (car (last catches)))))
+ (`(quote . ,_) (setq sexp nil))
(`(,_ . ,_)
(lisp--local-variables-1 vars (car (last sexp))))
(`lisp--witness--lisp (or vars '(nil)))