From 5a0e36bb41c19e9cff675d61c407727d833a40ee Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sun, 6 Apr 2003 10:53:39 +0000
Subject: [PATCH] Synch to Oort Gnus 200304060123.

---
 lisp/ChangeLog    |   21 +++++++++++++++++++++
 lisp/mm-bodies.el |    5 +++--
 lisp/mm-uu.el     |    6 ++++--
 lisp/mml2015.el   |    7 ++++---
 lisp/nnmail.el    |    3 ++-
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a56814c..0393170 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2003-04-06  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-uu.el (mm-uu-pgp-signed-extract-1): Set
+	buffer-file-coding-system.
+
+	* mm-bodies.el (mm-decode-body): Set buffer-file-coding-system to
+	last-coding-system-used.
+
+	* mml2015.el (mml2015-pgg-clear-verify): Encode the text
+	according to buffer-file-coding-system.
+
+	* pgg-gpg.el (pgg-gpg-process-region): Revert previous change.
+
+	* pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)
+	(pgg-pgp-snarf-keys-region): do.
+
+	* pgg-pgp5.el (pgg-pgp5-verify-region)
+	(pgg-pgp5-snarf-keys-region, pgg-pgp5-process-region): do.
+
+	* pgg.el (pgg-make-temp-file, pgg-temporary-file-directory): do.
+
 2003-04-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam.el (spam-split): (save-excursion) around (widen)
diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index e4c7894..ebadc4d 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -276,7 +276,8 @@ use the supplied charset unconditionally."
 	      (mm-decode-coding-region (point-min) (point-max)
 					      coding-system)
 	    (mm-decode-coding-region-safely (point-min) (point-max)
-					    coding-system)))))))
+					    coding-system))))
+      (setq buffer-file-coding-system last-coding-system-used))))
 
 (defun mm-decode-coding-region-safely (start end coding-system)
   "Decode region between START and END with CODING-SYSTEM.
diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index df5566c..9c38bf2 100644
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -1,5 +1,5 @@
 ;;; mm-uu.el --- Return uu stuff as mm handles
-;; Copyright (c) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
@@ -316,8 +316,10 @@ Return that buffer."
   (defvar gnus-newsgroup-charset))
 
 (defun mm-uu-pgp-signed-extract-1 (handles ctl)
-  (let ((buf (mm-uu-copy-to-buffer (point-min) (point-max))))
+  (let ((buf (mm-uu-copy-to-buffer (point-min) (point-max)))
+	(coding-system buffer-file-coding-system))
     (with-current-buffer buf
+      (setq buffer-file-coding-system coding-system)
       (if (mm-uu-pgp-signed-test)
 	  (progn
 	    (mml2015-clean-buffer)
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 0f8c5f6..2aa99b5 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1,5 +1,5 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
@@ -774,11 +774,12 @@
 
 (defun mml2015-pgg-clear-verify ()
   (let ((pgg-errors-buffer mml2015-result-buffer)
-	(text (current-buffer)))
+	(text (buffer-string))
+	(coding-system buffer-file-coding-system))
     (if (condition-case err
 	    (prog1
 		(mm-with-unibyte-buffer
-		  (insert-buffer text)
+		  (insert (encode-coding-string text coding-system))
 		  (pgg-verify-region (point-min) (point-max) nil t))
 	      (goto-char (point-min))
 	      (while (search-forward "\r\n" nil t)
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 0cdc420..6095820 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1187,7 +1187,8 @@ Return the number of characters in the body."
 	      nil t)
 	(delete-region (match-beginning 2) (match-end 0))
 	(beginning-of-line))
-      (when (re-search-forward "^Subject: +\\(\\(R[Ee]: +\\)+\\)R[Ee]: +" nil t)
+      (when (re-search-forward "^Subject: +\\(\\(R[Ee]: +\\)+\\)R[Ee]: +"
+			       nil t)
 	(delete-region (match-beginning 1) (match-end 1))
 	(beginning-of-line)))))
 
-- 
1.7.10.4