[Emacs-diffs] emacs/lisp/gnus mml.el ChangeLog

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     09/03/03 02:32:24

Modified files:
        lisp/gnus      : mml.el ChangeLog 

Log message:
        Merge from gnus--devo--0
        
        Revision: address@hidden/emacs--devo--0--patch-1561

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mml.el?cvsroot=emacs&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.803&r2=1.804

Patches:
Index: mml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- mml.el      5 Jan 2009 03:22:10 -0000       1.60
+++ mml.el      3 Mar 2009 02:32:23 -0000       1.61
@@ -898,10 +898,17 @@
       (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
        (save-excursion
          (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
+         (if (eq (mail-content-type-get (mm-handle-type handle) 'charset)
+                 'gnus-decoded)
+             ;; A part that mm-uu dissected from a non-MIME message
+             ;; because of `gnus-article-emulate-mime'.
+             (progn
+               (mm-enable-multibyte)
+               (insert-buffer-substring (mm-handle-buffer handle)))
          (mm-insert-part handle 'no-cache)
          (if (setq mmlp (equal (mm-handle-media-type handle)
                                "message/rfc822"))
-             (mime-to-mml)))))
+               (mime-to-mml))))))
     (if mmlp
        (mml-insert-mml-markup handle nil t t)
       (unless (and no-markup

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -b -r1.803 -r1.804
--- ChangeLog   25 Feb 2009 04:20:32 -0000      1.803
+++ ChangeLog   3 Mar 2009 02:32:23 -0000       1.804
@@ -1,3 +1,7 @@
+2009-03-02  Katsumi Yamaoka  <address@hidden>
+
+       * mml.el (mml-insert-mime): Don't break parts that mm-uu dissected.
+
 2009-02-25  Katsumi Yamaoka  <address@hidden>
 
        * gnus-dired.el: Remove autoload for gnus-setup-message.