From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Thu, 7 May 2015 20:13:29 +0000 (+0100)
Subject: * lisp/emacs-lisp/subr-x.el (if-let): Fix debug spec
X-Git-Tag: emacs-25.0.90~2158
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a33ac8911e835bf2be3ed34dd1288521ade91a8;p=emacs.git

* lisp/emacs-lisp/subr-x.el (if-let): Fix debug spec

Support the case when BINDINGS is a single tuple.  (Bug#20525)
---

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 78a6dc98456..bd178faa4af 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -120,7 +120,8 @@ Argument BINDINGS is a list of tuples whose car is a symbol to be
 bound and (optionally) used in THEN, and its cadr is a sexp to be
 evalled to set symbol's value.  In the special case you only want
 to bind a single value, BINDINGS can just be a plain tuple."
-  (declare (indent 2) (debug ((&rest (symbolp form)) form body)))
+  (declare (indent 2)
+           (debug ([&or (&rest (symbolp form)) (symbolp form)] form body)))
   (when (and (<= (length bindings) 2)
              (not (listp (car bindings))))
     ;; Adjust the single binding case