[Emacs-diffs] emacs-24 r117586: * lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.

[Stefan Monnier]

------------------------------------------------------------
revno: 117586
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18688
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-10-14 22:00:20 -0400
message:
  * lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
  Backported.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp.el        lisp.el-20091113204419-o5vbwnq5f7feedwu-131

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-14 19:29:47 +0000
+++ b/lisp/ChangeLog    2014-10-15 02:00:20 +0000
@@ -1,7 +1,12 @@
+2014-10-15  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
+       Backported (bug#18688).
+
 2014-10-14  Eli Zaretskii  <address@hidden>
 
-       * 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.
 

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2014-05-20 18:55:41 +0000
+++ b/lisp/emacs-lisp/lisp.el   2014-10-15 02:00:20 +0000
@@ -711,6 +711,7 @@
                     (`(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)))