From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 May 2015 21:43:43 +0000 (-0400)
Subject: (define-modify-macro): Make sure cl--arglist-args is defined
X-Git-Tag: emacs-25.0.90~2170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bceffdb3796df75b6f2efc2f6f17ca927a25c3b9;p=emacs.git

(define-modify-macro): Make sure cl--arglist-args is defined

* lisp/emacs-lisp/cl.el (define-modify-macro): Make sure
cl--arglist-args is defined (bug#20517).
---

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 564a44457d8..c966ace3852 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -626,6 +626,8 @@ You can replace this form with `gv-define-setter'.
 ;;     ...the rest, and build the 5-tuple))
 (make-obsolete 'get-setf-method 'gv-letplace "24.3")
 
+(declare-function cl--arglist-args "cl-macs" (args))
+
 (defmacro define-modify-macro (name arglist func &optional doc)
   "Define a `setf'-like modify macro.
 If NAME is called, it combines its PLACE argument with the other
@@ -639,6 +641,7 @@ You can replace this macro with `gv-letplace'."
                      symbolp &optional stringp)))
   (if (memq '&key arglist)
       (error "&key not allowed in define-modify-macro"))
+  (require 'cl-macs)                    ;For cl--arglist-args.
   (let ((place (make-symbol "--cl-place--")))
     `(cl-defmacro ,name (,place ,@arglist)
        ,doc