[Emacs-diffs] /srv/bzr/emacs/trunk r100214: Synch with Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100214 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-10 12:09:27 +0000
message:
  Synch with Gnus trunk.
  2010-05-10  Katsumi Yamaoka  <address@hidden>
   * mm-util.el (mm-emacs-mule): Remove.
  
  2010-05-10  Andreas Seltenreich  <address@hidden>
   * 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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/mm-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-05-10 07:25:27 +0000
+++ b/lisp/gnus/ChangeLog       2010-05-10 12:07:40 +0000
@@ -1,5 +1,15 @@
 2010-05-10  Katsumi Yamaoka  <address@hidden>
 
+       * mm-util.el (mm-emacs-mule): Remove.
+
+2010-05-10  Andreas Seltenreich  <address@hidden>
+
+       * 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  <address@hidden>
+
        * mm-util.el (mm-with-unibyte-current-buffer): Redefine it so as not to
        bind the default value of enable-multibyte-characters to nil.
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-05-07 06:58:17 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-05-10 12:07:40 +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

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-05-10 07:25:27 +0000
+++ b/lisp/gnus/mm-util.el      2010-05-10 12:07:40 +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 ()