diff options
Diffstat (limited to 'lisp/emacs-lisp/gv.el')
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index eb0e64e22b8..d1f997c99c4 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -84,14 +84,7 @@ DO must return an Elisp expression." (if (symbolp place) (funcall do place (lambda (v) `(setq ,place ,v))) (let* ((head (car place)) - (gf (get head 'gv-expander))) - ;; Autoload the head, if applicable, since that might define - ;; `gv-expander'. - (when (and (null gf) (fboundp head) - (eq 'autoload (car-safe (symbol-function head)))) - (with-demoted-errors - (load (nth 1 (symbol-function head)) 'noerror 'nomsg) - (setq gf (get head 'gv-expander)))) + (gf (function-get head 'gv-expander 'autoload))) (if gf (apply gf do (cdr place)) (let ((me (macroexpand place ;FIXME: expand one step at a time! ;; (append macroexpand-all-environment |