diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
| commit | 6445ee0fb751ae2c1dfef900d44721b3d952812f (patch) | |
| tree | d43006cb93d9ea7b00ea02aabcd5577c41ff827f /lisp/emacs-lisp/cl.el | |
| parent | f92ac2e82ed199d6f25d2a59508e08addb1150ac (diff) | |
| parent | c9c4708ed47b18987940a71b98eb9873150d2b95 (diff) | |
| download | emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.gz emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.bz2 emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/emacs-lisp/cl.el')
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 3 |
1 files changed, 3 insertions, 0 deletions
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 |