Synch with Gnus trunk.

2010-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 * mm-util.el (mm-emacs-mule): Remove.

2010-05-10  Andreas Seltenreich  <seltenreich@gmx.de>
 * gnus-sum.el (gnus-summary-mode): Don't make minor-mode-alist
 buffer-local as it's incompatible with Stefan Monnier's 2010-05-03
 change.

3 files changed, 10 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b1a687f8aff..4460e9b6d0b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,15 @@
 2010-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * mm-util.el (mm-emacs-mule): Remove.
+
+2010-05-10  Andreas Seltenreich  <seltenreich@gmx.de>
+
+        * gnus-sum.el (gnus-summary-mode): Don't make minor-mode-alist
+        buffer-local as it's incompatible with Stefan Monnier's 2010-05-03
+        change.
+
+2010-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
         * mm-util.el (mm-with-unibyte-current-buffer): Redefine it so as not to
         bind the default value of enable-multibyte-characters to nil.
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 480c546ca6e..c142e7d6571 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3056,7 +3056,6 @@ The following commands are available:
   (gnus-simplify-mode-line)
   (setq major-mode 'gnus-summary-mode)
   (setq mode-name "Summary")
-  (make-local-variable 'minor-mode-alist)
   (use-local-map gnus-summary-mode-map)
   (buffer-disable-undo)
   (setq buffer-read-only t              ;Disable modification
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index fe7fd78afa2..f657000205e 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -902,12 +902,6 @@ mail with multiple parts is preferred to sending a Unicode one.")
       out)))
 
 (eval-and-compile
-  (defvar mm-emacs-mule (and (not (featurep 'xemacs))
-                             (boundp 'enable-multibyte-characters)
-                             (default-value 'enable-multibyte-characters)
-                             (fboundp 'set-buffer-multibyte))
-    "True in Emacs with Mule.")
-
   (if (featurep 'xemacs)
       (defalias 'mm-enable-multibyte 'ignore)
     (defun mm-enable-multibyte ()