From 509f6126d80c2a843479eeaae7d8995e51ccb2bf Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 26 Mar 1999 07:14:00 +0000
Subject: [PATCH] * gnus.el (gnus-revision-number): Increment to 06. * pop3.el
 (pop3-munge-message-separator): If a retrieved message has
 a illegal date field, use `(current-time)' instead. *
 message.el (message-send): Kill `message-encoding-buffer'
 after sending. (message-maybe-encode): Inherit the buffer
 local variable `mime-edit-pgp-processing' and call
 `mime-edit-pgp-enclose-buffer'.

---
 lisp/gnus.el    |    2 +-
 lisp/message.el |   39 +++++++++++++++++++++++----------------
 lisp/pop3.el    |    4 +++-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index f788667..734a28e 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -268,7 +268,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.10.062"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "05"
+(defconst gnus-revision-number "06"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "0.80"
diff --git a/lisp/message.el b/lisp/message.el
index 7254eac..57bf23e 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2356,22 +2356,24 @@ the user from the mailer."
 				    (car elem))))
 			      (setq success (funcall (caddr elem) arg)))))
 	    (setq sent t))))
-      (when (and success sent)
-	(message-do-fcc)
-	;;(when (fboundp 'mail-hist-put-headers-into-history)
-	;; (mail-hist-put-headers-into-history))
-	(save-excursion
-	  (run-hooks 'message-sent-hook))
-	(message "Sending...done")
-	;; Mark the buffer as unmodified and delete autosave.
-	(set-buffer-modified-p nil)
-	(delete-auto-save-file-if-necessary t)
-	(message-disassociate-draft)
-	;; Delete other mail buffers and stuff.
-	(message-do-send-housekeeping)
-	(message-do-actions message-send-actions)
-	;; Return success.
-	t))))
+      (prog1
+	  (when (and success sent)
+	    (message-do-fcc)
+	    ;;(when (fboundp 'mail-hist-put-headers-into-history)
+	    ;; (mail-hist-put-headers-into-history))
+	    (save-excursion
+	      (run-hooks 'message-sent-hook))
+	    (message "Sending...done")
+	    ;; Mark the buffer as unmodified and delete autosave.
+	    (set-buffer-modified-p nil)
+	    (delete-auto-save-file-if-necessary t)
+	    (message-disassociate-draft)
+	    ;; Delete other mail buffers and stuff.
+	    (message-do-send-housekeeping)
+	    (message-do-actions message-send-actions)
+	    ;; Return success.
+	    t)
+	(kill-buffer message-encoding-buffer)))))
 
 (defun message-send-via-mail (arg)
   "Send the current message via mail."
@@ -4806,9 +4808,14 @@ regexp varstr."
 
 (defun message-maybe-encode ()
   (when message-mime-mode
+    ;; Inherit the buffer local variable `mime-edit-pgp-processing'.
+    (let ((pgp-processing (with-current-buffer message-edit-buffer
+			    mime-edit-pgp-processing)))
+      (setq mime-edit-pgp-processing pgp-processing))
     (run-hooks 'mime-edit-translate-hook)
     (if (catch 'mime-edit-error
 	  (save-excursion
+	    (mime-edit-pgp-enclose-buffer)
 	    (mime-edit-translate-body)
 	    ))
 	(error "Translation error!")
diff --git a/lisp/pop3.el b/lisp/pop3.el
index a4821a4..6ef68fa 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -215,7 +215,9 @@ Return the response string if optional second argument is non-nil."
 	    (setq date (format-time-string
 			"%a %b %e %T %Y"
 			(if date
-			    (apply 'encode-time (parse-time-string date))
+			    (condition-case nil
+				(apply 'encode-time (parse-time-string date))
+			      (error (current-time)))
 			  (current-time))))
 	    (setq From_ (format "\nFrom %s  %s\n" from date))
 	    (while (string-match "," From_)
-- 
1.7.10.4