Revision: emacs@sv.gnu.org/emacs--devo--0--patch-257

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 98)

   - Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c547166bfa7b688a96e66565bcb15b3a275c1b22..fc1c8881b820950507ce26cd9a78fa86a9daa22e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-uu.el (mm-uu-pgp-encrypted-extract-1): Assume buffer is made
+       unibyte after clear-decrypt function runs.
+
+       * mml2015.el (mml2015-pgg-clear-decrypt): Treat data which pgg
+       returns as a unibyte string.
+
 2006-04-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Don't fbind string-as-multibyte for XEmacs.

diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 944e40bc9646485858d89863a8a319d001e08a12..9d9d87a3670c25ac76ea2124d7cf5e6ce1a8fd50 100644 (file)
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -436,11 +436,18 @@ Return that buffer."
                        "OK")))
          (progn
            ;; Decode charset.
-           (when (and (or charset
-                          (setq charset gnus-newsgroup-charset))
-                      (setq charset (mm-charset-to-coding-system charset))
-                      (not (eq charset 'ascii)))
-             (mm-decode-coding-region (point-min) (point-max) charset))
+           (if (and (or charset
+                        (setq charset gnus-newsgroup-charset))
+                    (setq charset (mm-charset-to-coding-system charset))
+                    (not (eq charset 'ascii)))
+               ;; Assume that buffer's multibyteness is turned off.
+               ;; See `mml2015-pgg-clear-decrypt'.
+               (insert (mm-decode-coding-string (prog1
+                                                    (buffer-string)
+                                                  (erase-buffer)
+                                                  (mm-enable-multibyte))
+                                                charset))
+             (mm-enable-multibyte))
            (list (mm-make-handle buf mm-uu-text-plain-type)))
        (list (mm-make-handle buf '("application/pgp-encrypted")))))))
 

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 80dd5b265979c6044b1882042ac1c0f8ac919ed4..591ef647678ff1e17d37d78a592c22f72e3e5d7e 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -707,6 +707,8 @@
             (buffer-string))))
        (progn
          (erase-buffer)
+         ;; Treat data which pgg returns as a unibyte string.
+         (mm-disable-multibyte)
          (insert-buffer-substring pgg-output-buffer)
          (goto-char (point-min))
          (while (search-forward "\r\n" nil t)