; Unconditionally require built-in libraries

3 files changed, 7 insertions, 8 deletions

diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 7f200534ef9..5b902902378 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -510,7 +510,7 @@ font-lock is done highlighting.")
   nil)
 
 ;; Register mh-folder-mode as supporting which-function-mode...
-(eval-and-compile (require 'which-func nil t))
+(require 'which-func)
 (when (and (boundp 'which-func-modes) (listp which-func-modes))
   (add-to-list 'which-func-modes 'mh-folder-mode))
 
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 685553164cf..b797000566e 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -28,12 +28,11 @@
 
 (require 'mh-e)
 
-(eval-and-compile
-  (require 'gnus-util nil t)
-  (require 'mm-bodies nil t)
-  (require 'mm-decode nil t)
-  (require 'mm-view nil t)
-  (require 'mml nil t))
+(require 'gnus-util)
+(require 'mm-bodies)
+(require 'mm-decode)
+(require 'mm-view)
+(require 'mml)
 
 (defun mh-gnus-local-map-property (map)
   "Return a list suitable for a text property list specifying keymap MAP."
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 8a8a8c33581..058ea4499fd 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1411,7 +1411,7 @@ being the list of messages originally from that folder."
     (when cur-msg (mh-goto-msg cur-msg t t))
     (set-buffer-modified-p old-buffer-modified-flag)))
 
-(eval-and-compile (require 'which-func nil t))
+(require 'which-func)
 
 ;;;###mh-autoload
 (defun mh-index-create-imenu-index ()