* 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'.

diff --git a/lisp/message.el b/lisp/message.el
index 5a6afa2..5f5f844 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2153,6 +2153,7 @@ the user from the mailer."
                                    (car elem))))
                              (setq success (funcall (caddr elem) arg)))))
            (setq sent t))))
+      (prog1
       (when (and success sent)
        (message-do-fcc)
        ;;(when (fboundp 'mail-hist-put-headers-into-history)
@@ -2167,7 +2168,8 @@ the user from the mailer."
        (message-do-send-housekeeping)
        (message-do-actions message-send-actions)
        ;; Return success.
-       t))))
+       t)
+      (kill-buffer message-encoding-buffer)))))
 
 (defun message-send-via-mail (arg)
   "Send the current message via mail."
@@ -4457,9 +4459,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 307a1dd..1bc7a47 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -91,7 +91,8 @@ Used for APOP authentication.")
       (pop3-retr process n crashbuf)
       (save-excursion
        (set-buffer crashbuf)
-       (write-region-as-binary (point-min) (point-max) crashbox 'append)
+       (write-region-as-binary (point-min) (point-max)
+                               crashbox 'append 'nomesg)
        (set-buffer (process-buffer process))
        (while (> (buffer-size) 5000)
          (goto-char (point-min))
@@ -214,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_)