From: Johan Bockgård <bojohan@gnu.org>
Date: Sun, 15 Nov 2015 23:07:06 +0000 (+0100)
Subject: pcase.el: Fix edebugging of backquoted cons patterns
X-Git-Tag: emacs-25.0.90~770
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4b20fc936736053a0a07e060a1b8ff46c48e432;p=emacs.git

pcase.el: Fix edebugging of backquoted cons patterns

* lisp/emacs-lisp/pcase.el (pcase-QPAT): Fix edebugging of backquoted
cons patterns. (Bug#21920)
---

diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index bf6550dfa3d..c87c2314be3 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -865,8 +865,10 @@ Otherwise, it defers to REST which is a list of branches of the form
 
 (def-edebug-spec
   pcase-QPAT
+  ;; Cf. edebug spec for `backquote-form' in edebug.el.
   (&or ("," pcase-PAT)
-       (pcase-QPAT . pcase-QPAT)
+       (pcase-QPAT [&rest [&not ","] pcase-QPAT]
+		   . [&or nil pcase-QPAT])
        (vector &rest pcase-QPAT)
        sexp))