From: Henrik Enberg <henrik.enberg@telia.com>
Date: Tue, 17 Jan 2006 21:33:12 +0000 (+0000)
Subject: (rmail-process-new-messages): Don't require rmailkwd
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6f823d4a425c0525014a4a887eb44056e02755b;p=emacs.git

(rmail-process-new-messages): Don't require rmailkwd
here, do it at toplevel instead.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e03e68bb37b..e0bc1378882 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -46,7 +46,8 @@
 
 (eval-and-compile
   (require 'rmaildesc)
-  (require 'rmailhdr))
+  (require 'rmailhdr)
+  (require 'rmailkwd))
 
 (defvar deleted-head)
 (defvar font-lock-fontified)
@@ -2001,7 +2002,6 @@ non-nil then do not show any progress messages."
           (when keywords
 	    ;; Keywords do exist.  Register them with the keyword
 	    ;; management library.
-	    (require 'rmailkwd)
 	    (rmail-keyword-register-keywords keywords))
 
 	  ;; Insure that we have From and Date headers.