Backport fix for bug#12879 from trunk

* lisp/emacs-lisp/gv.el (setf): Fix debug spec for multiple assignments

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80ae61df8c1eedb4a427fa83962fd0fe6bee42cb..f78240cdced04b68a1017fb8bdc824aa5a6a2de2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/gv.el (setf): Fix debug spec for multiple assignments
+       (bug#12879).
+
 2012-11-14  Glenn Morris  <rgm@gnu.org>
 
        * subr.el (set-temporary-overlay-map): Doc fix.

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 965fc1c3ef02d21ab8a531ebdbc3d658e7cf9536..49fefcf523315d094dc31eec867a9d5491c656b3 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -236,7 +236,7 @@ For example, (setf (cadr x) y) is equivalent to (setcar (cdr x) y).
 The return value is the last VAL in the list.
 
 \(fn PLACE VAL PLACE VAL ...)"
-  (declare (debug (gv-place form)))
+  (declare (debug (&rest [gv-place form])))
   (if (and args (null (cddr args)))
       (let ((place (pop args))
             (val (car args)))