From 1f8036a522d4a7603e0b07fa5cc70f5bbdc15653 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 6 May 2017 18:20:21 -0700
Subject: [PATCH] Evaluate mh-require when compiling

* lisp/mh-e/mh-alias.el, lisp/mh-e/mh-folder.el:
* lisp/mh-e/mh-gnus.el, lisp/mh-e/mh-search.el:
Evaluate mh-require when compiling, as require is automatically.
* lisp/mh-e/mh-gnus.el: No longer disable byte-compilation.
---
 lisp/mh-e/mh-alias.el  |  5 +++--
 lisp/mh-e/mh-folder.el |  2 +-
 lisp/mh-e/mh-gnus.el   | 12 ++++++------
 lisp/mh-e/mh-search.el |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 82602eecf27..d62ac671ea1 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -252,8 +252,9 @@ Blind aliases or users from /etc/passwd are not expanded."
    (t
     (mh-alias-ali alias))))
 
-(mh-require 'crm nil t)                 ; completing-read-multiple
-(mh-require 'multi-prompt nil t)
+(eval-and-compile
+  (mh-require 'crm nil t)                 ; completing-read-multiple
+  (mh-require 'multi-prompt nil t))
 
 ;;;###mh-autoload
 (defun mh-read-address (prompt)
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index acef35d6cd2..f846f179433 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -525,7 +525,7 @@ font-lock is done highlighting.")
                         (cons (current-buffer) nil)))))
 
 ;; Register mh-folder-mode as supporting which-function-mode...
-(mh-require 'which-func nil t)
+(eval-and-compile (mh-require 'which-func nil t))
 (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 3afdb7501ff..318759ddc1b 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -30,11 +30,12 @@
 
 (require 'mh-e)
 
-(mh-require 'gnus-util nil t)
-(mh-require 'mm-bodies nil t)
-(mh-require 'mm-decode nil t)
-(mh-require 'mm-view nil t)
-(mh-require 'mml nil t)
+(eval-and-compile
+  (mh-require 'gnus-util nil t)
+  (mh-require 'mm-bodies nil t)
+  (mh-require 'mm-decode nil t)
+  (mh-require 'mm-view nil t)
+  (mh-require 'mml nil t))
 
 ;; Copy of function from gnus-util.el.
 ;; TODO This is not in Gnus 5.11.
@@ -170,7 +171,6 @@ PROMPT overrides the default one used to ask user for a file name."
 (provide 'mh-gnus)
 
 ;; Local Variables:
-;; no-byte-compile: t
 ;; no-update-autoloads: t
 ;; indent-tabs-mode: nil
 ;; sentence-end-double-space: nil
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 099f922a5e8..7ff35645bdd 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1416,7 +1416,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)))
 
-(mh-require 'which-func nil t)
+(eval-and-compile (mh-require 'which-func nil t))
 
 ;; Shush compiler.
 (defvar which-func-mode)                ; < Emacs 22, XEmacs
-- 
2.39.2