From e32bae617788bc22f2d6643d920ebcafa70a002d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 16 Jan 2020 21:21:29 -0800 Subject: 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. --- lisp/cedet/ede.el | 5 ++--- lisp/cedet/semantic/imenu.el | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'lisp/cedet') diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 1418ad9539d..c2036878288 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -1527,8 +1527,7 @@ It does not apply the value to buffers." ;; If this does not occur after the provide, we can get a recursive ;; load. Yuck! -(if (featurep 'speedbar) - (ede-speedbar-file-setup) - (add-hook 'speedbar-load-hook 'ede-speedbar-file-setup)) +(with-eval-after-load 'speedbar + (ede-speedbar-file-setup)) ;;; ede.el ends here diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 19e0515ac63..cdf0a23fa07 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -44,9 +44,8 @@ ;; Because semantic imenu tags will hose the current imenu handling ;; code in speedbar, force semantic/sb in. -(if (featurep 'speedbar) - (require 'semantic/sb) - (add-hook 'speedbar-load-hook (lambda () (require 'semantic/sb)))) +(with-eval-after-load 'speedbar + (require 'semantic/sb)) (defgroup semantic-imenu nil "Semantic interface to Imenu." -- cgit v1.2.1