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.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b1a687f8aff1f6df06ff333b9b89e41b0d724db2..4460e9b6d0b1dc37e784abb960f139e38cf84561 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 480c546ca6e7d12ed84e4fcd4f69cde5dfcc1632..c142e7d657150a63fdb05a57e4b750d235bdc647 100644 (file)
--- 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 fe7fd78afa24527e14a3f4a59813a1cc7edcda31..f657000205ec97185faadfd5d934d2546a95d1b7 100644 (file)
--- 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 ()