summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-01-16 21:21:29 -0800
committerGlenn Morris <rgm@gnu.org>2020-01-16 21:21:29 -0800
commite32bae617788bc22f2d6643d920ebcafa70a002d (patch)
tree7c4e5f8fc6245285a88623fcb4e259e449768f3b /lisp/emacs-lisp
parent98c6416bfd31b7f19de4b6289715cc73df3c6394 (diff)
downloademacs-e32bae617788bc22f2d6643d920ebcafa70a002d.tar.gz
emacs-e32bae617788bc22f2d6643d920ebcafa70a002d.tar.bz2
emacs-e32bae617788bc22f2d6643d920ebcafa70a002d.zip
Replace add-hook load-hook with with-eval-after-load
* lisp/info.el (Info-install-speedbar-variables): * lisp/cedet/ede.el (speedbar): * lisp/cedet/semantic/imenu.el (speedbar): * lisp/emacs-lisp/eieio-opt.el (eieio-class-speedbar-key-map): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-create): * lisp/erc/erc-speedbar.el (erc-install-speedbar-variables): * lisp/mail/rmail.el (rmail-install-speedbar-variables): * lisp/progmodes/gud.el (gud-install-speedbar-variables): Use with-eval-after-load.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eieio-opt.el9
-rw-r--r--lisp/emacs-lisp/eieio-speedbar.el6
2 files changed, 2 insertions, 13 deletions
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index dda90373069..59af7e12d21 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -278,14 +278,7 @@ are not abstract."
(if eieio-class-speedbar-key-map
nil
- (if (not (featurep 'speedbar))
- (add-hook 'speedbar-load-hook (lambda ()
- (eieio-class-speedbar-make-map)
- (speedbar-add-expansion-list
- '("EIEIO"
- eieio-class-speedbar-menu
- eieio-class-speedbar-key-map
- eieio-class-speedbar))))
+ (with-eval-after-load 'speedbar
(eieio-class-speedbar-make-map)
(speedbar-add-expansion-list '("EIEIO"
eieio-class-speedbar-menu
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index c11608da5d8..5c6e0e516d1 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -140,11 +140,7 @@ MENU-VAR is the symbol containing an easymenu compatible menu part to use.
MODENAME is a string used to identify this browser mode.
FETCHER is a generic function used to fetch the base object list used when
creating the speedbar display."
- (if (not (featurep 'speedbar))
- (add-hook 'speedbar-load-hook
- (list 'lambda nil
- (list 'eieio-speedbar-create-engine
- map-fn map-var menu-var modename fetcher)))
+ (with-eval-after-load 'speedbar
(eieio-speedbar-create-engine map-fn map-var menu-var modename fetcher)))
(defun eieio-speedbar-create-engine (map-fn map-var menu-var modename fetcher)