* message.el: Require `base64' before `canlock-om' to avoid damage to define

 `base64-encode-string' by MEL.

* dgnushack.el: Load base64.el before canlock-om.el to avoid damage to define
 `base64-encode-string' by MEL.

diff --git a/ChangeLog b/ChangeLog
index 800146e..d953d15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/message.el: Require `base64' before `canlock-om' to avoid
+       damage to define `base64-encode-string' by MEL.
+
+       * lisp/dgnushack.el: Load base64.el before canlock-om.el to avoid
+       damage to define `base64-encode-string' by MEL.
+
+2002-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * lisp/gnus-sum.el (gnus-article-commands-menu): Bind "Html" to
        the command `gnus-article-wash-html'.
        (gnus-summary-article-menu): Ditto.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index b08941d..efd9c4d 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -226,6 +226,10 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
 (load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
 
 (when (boundp 'MULE)
+  ;; Bind the function `base64-encode-string' before loading canlock.
+  ;; Since canlock will bind it as an autoloaded function, it causes
+  ;; damage to define the function by MEL.
+  (load (expand-file-name "base64.el" srcdir) nil t t)
   ;; Load special macros for compiling canlock.el.
   (load (expand-file-name "canlock-om.el" srcdir) nil t t))
 

diff --git a/lisp/message.el b/lisp/message.el
index abefb93..b3ab83f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -42,7 +42,9 @@
   (defvar gnus-list-identifiers)) ; gnus-sum is required where necessary
 (eval-and-compile
   (if (boundp 'MULE)
-      (require 'canlock-om)
+      (progn
+       (require 'base64)
+       (require 'canlock-om))
     (require 'canlock)))
 (require 'mailheader)
 (require 'nnheader)