changeset 108466:a30c85fa75e8

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.
author Katsumi Yamaoka <katsumi@flagship2>
date Mon, 10 May 2010 12:09:27 +0000
parents 7642d075642b (current diff) fa6c01b64da2 (diff)
children 114b70461f96
files
diffstat 3 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Mon May 10 07:26:12 2010 +0000
+++ b/lisp/gnus/ChangeLog	Mon May 10 12:09:27 2010 +0000
@@ -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
--- a/lisp/gnus/gnus-sum.el	Mon May 10 07:26:12 2010 +0000
+++ b/lisp/gnus/gnus-sum.el	Mon May 10 12:09:27 2010 +0000
@@ -3056,7 +3056,6 @@
   (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
--- a/lisp/gnus/mm-util.el	Mon May 10 07:26:12 2010 +0000
+++ b/lisp/gnus/mm-util.el	Mon May 10 12:09:27 2010 +0000
@@ -902,12 +902,6 @@
       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 ()