Synch to No Gnus 200406292339.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 845c0fd..a2aa049 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-util.el (mm-enrich-utf-8-by-mule-ucs): Fix cleaning of
+       after-load-alist.
+
 2004-06-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-group.el (gnus-group-get-new-news-this-group): Don't

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index bf208cc..c0862eb 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -270,9 +270,10 @@ system object in XEmacs."
 This function will run when the `un-define' module is loaded under
 XEmacs, and fill the `utf-8' entry in `mm-mime-mule-charset-alist'
 with Mule charsets.  It is completely useless for Emacs."
-  (setq after-load-alist
-       (delete '("un-define" (mm-enrich-utf-8-by-mule-ucs))
-               after-load-alist))
+  (unless (cdr (delete '(mm-enrich-utf-8-by-mule-ucs)
+                      (assoc "un-define" after-load-alist)))
+    (setq after-load-alist
+         (delete '("un-define") after-load-alist)))
   (when (boundp 'unicode-basic-translation-charset-order-list)
     (condition-case nil
        (let ((val (delq