diff options
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b99ae2f22f..7e09336183c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. 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))) |