[Emacs-diffs] Changes to emacs/lisp/gnus/rfc2231.el

[Kenichi Handa]

Index: emacs/lisp/gnus/rfc2231.el
diff -u emacs/lisp/gnus/rfc2231.el:1.15 emacs/lisp/gnus/rfc2231.el:1.16
--- emacs/lisp/gnus/rfc2231.el:1.15     Fri Feb 17 00:24:03 2006
+++ emacs/lisp/gnus/rfc2231.el  Thu Mar 23 05:51:03 2006
@@ -227,7 +227,7 @@
   (let ((coding-system (mm-charset-to-coding-system (match-string 2 string)))
        ;;(language (match-string 3 string))
        (value (match-string 4 string)))
-    (mm-with-multibyte-buffer
+    (mm-with-unibyte-buffer
       (insert value)
       (goto-char (point-min))
       (while (search-forward "%" nil t)
@@ -236,9 +236,9 @@
             (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
           (delete-region (1- (point)) (+ (point) 2)))))
       ;; Decode using the charset, if any.
-      (unless (memq coding-system '(nil ascii))
-       (mm-decode-coding-region (point-min) (point-max) coding-system))
-      (buffer-string))))
+      (if (memq coding-system '(nil ascii))
+         (buffer-string)
+       (mm-decode-coding-string (buffer-string) coding-system)))))
 
 (defun rfc2231-encode-string (param value)
   "Return and PARAM=VALUE string encoded according to RFC2231.
@@ -252,7 +252,7 @@
        ;; Don't make lines exceeding 76 column.
        (limit (- 74 (length param)))
        spacep encodep charsetp charset broken)
-    (with-temp-buffer
+    (mm-with-multibyte-buffer
       (insert value)
       (goto-char (point-min))
       (while (not (eobp))
@@ -268,6 +268,7 @@
        (forward-char 1))
       (when charsetp
        (setq charset (mm-encode-body)))
+      (set-buffer-multibyte nil)
       (cond
        ((or encodep charsetp
            (progn