Synch to No Gnus 200601190601.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68f7f67..f291679 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-bodies.el (mm-decode-body): Don't decode decoded body.
+
+       * mm-uu.el (mm-uu-dissect-text-parts): Dissect dissected parts.
+
+2006-01-19  Mark D. Baushke  <mdb@gnu.org>
+
+       * pgg-gpg.el (pgg-gpg-encrypt-region): Add --textmode to gpg args.
+
 2006-01-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-inlined-types): Add application/pgp.

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 21ee6c0..aee329b 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,7 +1,7 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -247,7 +247,8 @@ decoding.  If it is nil, default to `mail-parse-charset'."
   (save-excursion
     (when encoding
       (mm-decode-content-transfer-encoding encoding type))
-    (when (featurep 'mule)  ; Fixme: Wrong test for unibyte session.
+    (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session.
+              (not (eq charset 'gnus-decoded)))
       (let ((coding-system (mm-charset-to-coding-system
                            ;; Allow overwrite using
                            ;; `mm-charset-override-alist'.
@@ -263,8 +264,7 @@ decoding.  If it is nil, default to `mail-parse-charset'."
                   ;;in XEmacs
                   (mm-multibyte-p)
                   (or (not (eq coding-system 'ascii))
-                      (setq coding-system mail-parse-charset))
-                  (not (eq coding-system 'gnus-decoded)))
+                      (setq coding-system mail-parse-charset)))
          (mm-decode-coding-region (point-min) (point-max)
                                   coding-system))
        (setq buffer-file-coding-system

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index f106923..ec51314 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -636,7 +636,8 @@ value of `mm-uu-text-plain-type'."
                              (mm-uu-dissect t (mm-handle-type handle)))))
             (kill-buffer buffer)
             (setcar handle (car children))
-            (setcdr handle (cdr children))))
+            (setcdr handle (cdr children))
+            (mm-uu-dissect-text-parts handle)))
          (t
           (mapc 'mm-uu-dissect-text-parts handle)))))