summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2019-06-16 18:35:35 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2019-06-16 18:35:35 -0400
commit309743b465b569e4954e9c03c16fd675af5efc52 (patch)
tree9bdb8929c874d92562aab21d44787366547ac5b8 /lisp/emacs-lisp
parentfd9cff02796d7034783169015c592ed294ef106f (diff)
downloademacs-309743b465b569e4954e9c03c16fd675af5efc52.tar.gz
emacs-309743b465b569e4954e9c03c16fd675af5efc52.tar.bz2
emacs-309743b465b569e4954e9c03c16fd675af5efc52.zip
* lisp/emacs-lisp/cl-generic.el (gv-setter): Move declaration.
Move it to those places where we know gv has been loaded.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-generic.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 3348080c0be..9013c1f0607 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -101,8 +101,6 @@
(eval-when-compile (require 'cl-macs)) ;For cl--find-class.
(eval-when-compile (require 'pcase))
-(declare-function gv-setter "gv" (name))
-
(cl-defstruct (cl--generic-generalizer
(:constructor nil)
(:constructor cl-generic-make-generalizer
@@ -240,6 +238,7 @@ DEFAULT-BODY, if present, is used as the body of a default method.
(push `(,args ,@options-and-methods) methods))
(when (eq 'setf (car-safe name))
(require 'gv)
+ (declare-function gv-setter "gv" (name))
(setq name (gv-setter (cadr name))))
`(prog1
(progn
@@ -445,6 +444,7 @@ The set of acceptable TYPEs (also called \"specializers\") is defined
(setq args (pop body)))
(when (eq 'setf (car-safe name))
(require 'gv)
+ (declare-function gv-setter "gv" (name))
(setq name (gv-setter (cadr name))))
(pcase-let* ((`(,uses-cnm . ,fun) (cl--generic-lambda args body)))
`(progn