* lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.

Backported.

Fixes: debbugs:18688
This commit is contained in:
Stefan Monnier 2014-10-14 22:00:20 -04:00
parent e01955dfb3
commit 6d81466ac6
2 changed files with 8 additions and 2 deletions

View file

@ -1,7 +1,12 @@
2014-10-15 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
Backported (bug#18688).
2014-10-14 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp/tabulated-list.el (tabulated-list-mode): Force
bidi-paragraph-direction to 'left-to-right'. This fixes
* emacs-lisp/tabulated-list.el (tabulated-list-mode):
Force bidi-paragraph-direction to 'left-to-right'. This fixes
buffer-menu display when the first buffer happens to start with
R2L letter.

View file

@ -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)))