# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207426357 0
# Node ID 3e95f26e32414da304ed7b911a911f4937d40d6b
# Parent  2ca2b5f1a567c58e15df2e8189fbbc00e6ede4e0
(gnus-mime-replace-part): Remove unnecessary use of mm-with-multibyte.
(gnus-request-article-this-buffer): Make sure the proper decoding is used
if gnus-original-article-buffer happens to be unibyte.

diff -r 2ca2b5f1a567 -r 3e95f26e3241 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Apr 05 20:08:27 2008 +0000
+++ b/lisp/gnus/ChangeLog	Sat Apr 05 20:12:37 2008 +0000
@@ -1,5 +1,10 @@
 2008-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* gnus-art.el (gnus-mime-replace-part): Remove unnecessary use of
+	mm-with-multibyte.
+	(gnus-request-article-this-buffer): Make sure the proper decoding is used
+	if gnus-original-article-buffer happens to be unibyte.
+
 	* gnus-ems.el (gnus-x-splash): Prefer mm-disable-multibyte to
 	default-enable-multibyte-characters.
 
diff -r 2ca2b5f1a567 -r 3e95f26e3241 lisp/gnus/gnus-art.el
--- a/lisp/gnus/gnus-art.el	Sat Apr 05 20:08:27 2008 +0000
+++ b/lisp/gnus/gnus-art.el	Sat Apr 05 20:12:37 2008 +0000
@@ -4785,10 +4785,9 @@
   ;; Useful if file has already been saved to disk
   (interactive
    (list
-    (mm-with-multibyte
-      (read-file-name "Replace MIME part with file: "
-		      (or mm-default-directory default-directory)
-		      nil nil))))
+    (read-file-name "Replace MIME part with file: "
+                    (or mm-default-directory default-directory)
+                    nil nil)))
   (gnus-mime-save-part-and-strip file))
 
 (defun gnus-mime-save-part-and-strip (&optional file)
@@ -6586,7 +6585,13 @@
 		 (with-current-buffer gnus-original-article-buffer
 		   (and (equal (car gnus-original-article) group)
 			(eq (cdr gnus-original-article) article))))
-	    (insert-buffer-substring gnus-original-article-buffer)
+            ;; `insert-buffer-substring' would incorrectly use the
+            ;; equivalent of string-make-multibyte which amount to decoding
+            ;; with locale-coding-system, causing failure of
+            ;; subsequent decoding.
+            (insert (mm-string-to-multibyte
+                     (with-current-buffer gnus-original-article-buffer
+                       (buffer-substring (point-min) (point-max)))))
 	    'article)
 	   ;; Check the backlog.
 	   ((and gnus-keep-backlog