* lisp/emacs-lisp/pcase.el (pcase--u1): Verify if self-quoting values can be

checked with memq.

Fixes: debbugs:14935

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24fbe1acb2c79835b1e724791e3253288f30e89e..6679bf8a9e1083fa826f709ed32f0047ffaab469 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-07-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/pcase.el (pcase--u1): Verify if self-quoting values can be
+       checked with memq (bug#14935).
+
        * files.el (revert-buffer-function): Use a non-nil default.
        (revert-buffer-preserve-modes): Declare var to
        provide access to the `preserve-modes' argument.

diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 511f1480099c0d38c47a5aeea30533d09bb69e4a..50c92518b02336f75d73734e3dc933bcb3591f2e 100644 (file)
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -659,11 +659,15 @@ Otherwise, it defers to REST which is a list of branches of the form
               (memq-fine t))
           (when all
             (dolist (alt (cdr upat))
-              (unless (or (pcase--self-quoting-p alt)
-                          (and (eq (car-safe alt) '\`)
-                               (or (symbolp (cadr alt)) (integerp (cadr alt))
-                                   (setq memq-fine nil)
-                                   (stringp (cadr alt)))))
+              (unless (if (pcase--self-quoting-p alt)
+                          (progn
+                            (unless (or (symbolp alt) (integerp alt))
+                              (setq memq-fine nil))
+                            t)
+                        (and (eq (car-safe alt) '\`)
+                             (or (symbolp (cadr alt)) (integerp (cadr alt))
+                                 (setq memq-fine nil)
+                                 (stringp (cadr alt)))))
                 (setq all nil))))
           (if all
               ;; Use memq for (or `a `b `c `d) rather than a big tree.