[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/05 20:12:38

Index: gnus-art.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- gnus-art.el 29 Mar 2008 19:54:10 -0000      1.158
+++ gnus-art.el 5 Apr 2008 20:12:37 -0000       1.159
@@ -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))))
+                    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