From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 15 Oct 2014 02:00:20 +0000 (-0400)
Subject: * lisp/emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
X-Git-Tag: emacs-24.4-rc1~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d81466ac65eb84cb77eaa73e589628b5afcb963;p=emacs.git

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

Fixes: debbugs:18688
---

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