Synch with `t-gnus-6_14'.

diff --git a/ChangeLog b/ChangeLog
index 15a0eb8..0dc6f0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-06  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/imap.el: Require `base64' instead of to autoload it.
+
 2000-10-05  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/gnus-xmas.el (gnus-xmas-group-startup-message): Don't use

diff --git a/lisp/imap.el b/lisp/imap.el
index c82a726..e556169 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -139,10 +139,10 @@
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'static))
 
+(require 'base64)
+
 (eval-and-compile
   (autoload 'open-ssl-stream "ssl")
-  (autoload 'base64-decode-string "base64")
-  (autoload 'base64-encode-string "base64")
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls")
   (autoload 'rfc2104-hash "rfc2104")