Synch up with main trunk.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 43abc7f..b2e7e95 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-imap4.el (elmo-imap4-parse-status): Skip white spaces after
+       status number.
+
 2002-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-folder-mark-as-read): Added argument `ignore-flag'.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 7b51c92..5e90a59 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1548,7 +1548,8 @@ Return nil if no complete line has arrived."
                        (message
                         "Unknown status data %s in mailbox %s ignored"
                         token mailbox))))
-              status))))
+              status))
+       (skip-chars-forward " ")))
     (and elmo-imap4-status-callback
         (funcall elmo-imap4-status-callback
                  status

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1ccc7fe..657f017 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-draft.el (wl-draft-reply): Avoid error when buf and summary-buf
+       is nil.
+
+2002-09-17  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-mime.el (wl-mime-decrypt-application/pgp-encrypted): New
+       function, a wrapper for `mime-decrypt-application/pgp-encrypted'.
+       (wl-mime-setup): Add its entry.
+
 2002-09-17  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-summary.el (wl-summary-prefetch-msg): Use elmo-message-set-cached.
@@ -66,7 +77,7 @@
 
 2002-09-13  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
-       * wl-mime.el (wl-draft-preview-message): Revive the position
+       * wl-mime.el (wl-draft-preview-message): Restore the position
        before evaluating wl-draft-send-hook in preview buffer.
 
 2002-09-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index f1fe90a..e6f99e2 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -328,9 +328,10 @@ Reply to author if WITH-ARG is non-nil."
   (let (r-list
        to mail-followup-to cc subject in-reply-to references newsgroups
        to-alist cc-alist decoder parent-folder)
-    (set-buffer summary-buf)
-    (setq parent-folder (wl-summary-buffer-folder-name))
-    (set-buffer buf)
+    (when (buffer-live-p summary-buf)
+      (with-current-buffer summary-buf
+       (setq parent-folder (wl-summary-buffer-folder-name))))
+    (set-buffer (or buf mime-mother-buffer))
     (setq r-list (symbol-value (wl-draft-reply-list-symbol with-arg)))
     (catch 'done
       (while r-list

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 385329f..18c3034 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -309,6 +309,14 @@ By setting following-method as yank-content."
     (elmo-mime-insert-header entity situation)
     (wl-highlight-headers)))
 
+(defun wl-mime-decrypt-application/pgp-encrypted (entity situation)
+  (let ((summary-buffer wl-message-buffer-cur-summary-buffer)
+       (original-buffer wl-message-buffer-original-buffer))
+    (mime-decrypt-application/pgp-encrypted entity situation)
+    (setq wl-message-buffer-cur-summary-buffer summary-buffer)
+    (setq wl-message-buffer-original-buffer original-buffer)))
+   
+
 ;;; Setup methods.
 (defun wl-mime-setup ()
   (set-alist 'mime-preview-quitting-method-alist
@@ -340,6 +348,12 @@ By setting following-method as yank-content."
 
   (ctree-set-calist-strictly
    'mime-acting-condition
+   '((type . application) (subtype . pgp-encrypted)
+     (method . wl-mime-decrypt-application/pgp-encrypted)
+     (major-mode . wl-original-message-mode)))
+
+  (ctree-set-calist-strictly
+   'mime-acting-condition
    '((mode . "extract")
      (major-mode . wl-original-message-mode)
      (method . wl-mime-save-content)))