Don't autoload anything to turn on mail-hist.

(mail-hist-enable): New function, autoloaded.

diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index e0608a4cefd76539bfe7ef1c9cd1225e51437b66..fa0db93e2c0f252d4d5cf4aaad9f7f27dd2e0109 100644 (file)
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -61,13 +61,9 @@
   (local-set-key "\M-n" 'mail-hist-next-input))
 
 ;;;###autoload
-(add-hook 'mail-mode-hook 'mail-hist-define-keys)
-
-;;;###autoload
-(add-hook 'vm-mail-mode-hook 'mail-hist-define-keys)
-
-;;;###autoload
-(add-hook 'mail-send-hook 'mail-hist-put-headers-into-history)
+(defun mail-hist-enable ()
+  (add-hook 'mail-mode-hook 'mail-hist-define-keys)
+  (add-hook 'mail-send-hook 'mail-hist-put-headers-into-history))
 
 (defvar mail-hist-header-ring-alist nil
   "Alist of form (header-name . history-ring).