This commit was manufactured by cvs2svn to create tag 'merged-trunk-to-elmo-

mark-2'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 2c82aff..d0c8372 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-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * elmo-dop.el (elmo-dop-queue-flush): Remove unused argument.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index edd2702..2b68689 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1545,7 +1545,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 d6370da..21b79c1 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,19 @@
+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-13  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * 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>
 
        * wl-addrmgr.el (wl-addrmgr-apply-exec): Call wl-draft interactively

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 1847b6f..18c3034 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -72,6 +72,7 @@ By setting following-method as yank-content."
   "Preview editing message."
   (interactive)
   (let* (recipients-message
+        (current-point (point))
         (config-exec-flag wl-draft-config-exec-flag)
         (parent-folder wl-draft-parent-folder)
         (mime-display-header-hook 'wl-highlight-headers)
@@ -89,6 +90,7 @@ By setting following-method as yank-content."
             (lambda ()
               (let ((wl-draft-config-exec-flag config-exec-flag)
                     (wl-draft-parent-folder parent-folder))
+                (goto-char current-point)
                 (run-hooks 'wl-draft-send-hook)
                 (setq recipients-message
                       (condition-case err
@@ -307,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
@@ -338,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)))