From: teranisi <teranisi>
Date: Thu, 14 Nov 2002 13:17:38 +0000 (+0000)
Subject: Synch up with main trunk.
X-Git-Tag: elmo-mark-restart~85
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45bad69c8b7ce36aaee224001cf1e5a594a9b08;p=elisp%2Fwanderlust.git

Synch up with main trunk.
---

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 90a78c3..91a7298 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -3648,6 +3648,12 @@ prefix argument つきならば既にキャッシュされているメッセージも
 指定した他のプロセスにパイプ経由で引き渡します。
 (@code{wl-summary-target-mark-pipe})
 
+@item D
+@kindex D (Summary)
+@findex wl-summary-erase
+ごみ箱に移動せずに、その場で実際にメッセージを削除します。
+(@code{wl-summary-erase})
+
 @item M-t
 @kindex M-t (Summary)
 @findex wl-toggle-plugged
@@ -4653,12 +4659,23 @@ Non-nil ならウィンドウを表示しながらテンプレートを選択する場合、リターン
 @code{wl-template-visible-select}が non-nil の場合、
 適用後の状態を表示するウィンドウの大きさを指定します。
 
+@item wl-draft-buffer-style
+@vindex wl-draft-buffer-style
+初期設定は @code{full}。
+(返信と転送の場合以外の)ドラフトバッファのウインドウの形態を指定します。
+@code{keep} とすると現在のウィンドウを使い、
+@code{full} とするとフレーム全体のウインドウを使います。
+@code{split} とすると現在のウィンドウを分割して使います。
+関数が指定された場合、ドラフトバッファを引数としてそれ呼び出します。
+
 @item wl-draft-reply-buffer-style
 @vindex wl-draft-reply-buffer-style
 初期設定は @code{split}。
-@code{split} と @code{full} が指定できます。
-@code{full} なら返事を書くときにフレーム全体を使ったドラフトバッファが
-用意されます。
+返信と転送の場合のドラフトバッファのウインドウの形態を指定します。
+@code{keep} とするとメッセージバッファのウィンドウを使い、
+@code{full} とするとフレーム全体のウインドウを使います。
+@code{split} とするとメッセージバッファのウィンドウを分割して使います。
+関数が指定された場合、ドラフトバッファを引数としてそれ呼び出します。
 
 @item wl-draft-use-frame
 @vindex wl-draft-use-frame
@@ -6286,17 +6303,18 @@ pop3                    ×    △    △    △
 規則の基本単位は
 
 @lisp
-(@samp{条件} @samp{フォルダ} [@code{continue}])
+(@samp{CONDITION} @samp{ACTION} [@code{continue}])
 @end lisp
 
-という一組です。
-第一の要素 @samp{条件} は S 式です。書式についてはすぐ後で説明します。
-第二の要素 @samp{フォルダ} はメッセージの振り分け先のフォルダ名です。
-もし第三の要素 @code{continue} がシンボルとして与えられると、
-その条件が満たされたとしても振り分け規則の評価を続けます。
+という一組で、@samp{CONDITION} が真の場合に @samp{ACTION} を実行します。
+第一の要素 @samp{CONDITION} には条件を S 式で記述します。書式については
+すぐ後で説明します。第二の要素 @samp{ACTION} にはメッセージの振り分け先
+のフォルダ名、もしくはシンボルを指定します。
+第三の要素 @code{continue} をシンボルとして与えると、@samp{CONDITION} が
+満たされた場合にも振り分け規則の評価を継続します。
 
-@samp{条件} の記法は以下のようになります。実際の書き方は上で挙げた例を
-参考にして下さい。
+@samp{CONDITION} の記法は以下のようになります。実際の書き方は上で挙げた
+例を参考にして下さい。
 
 @enumerate
 @item
@@ -6338,6 +6356,37 @@ pop3                    ×    △    △    △
 シンボルが指定されると、それを評価します。
 @end enumerate
 
+@samp{ACTION} の値として指定できるのは以下のいずれかです。
+
+@enumerate
+@item
+フォルダ名
+
+文字列が指定されるとそれを振り分け先のフォルダ名とみなして、そのフォルダ
+へメッセージを追加します。
+
+@item
+@samp{delete}
+
+シンボル @samp{delete} が指定されると @code{elmo-split-folder} 内にある
+メッセージの実体を削除します。
+
+@item
+@samp{noop}
+
+シンボル @samp{noop} が指定された場合、そのメッセージに対しては何もせず、
+そのままの状態に保ちます。
+
+@item
+関数
+
+関数が指定された場合、それを実行します。
+@end enumerate
+
+全ての振り分け規則を通過したメッセージは、変数
+@code{elmo-split-default-action} で指定した @samp{ACTION} に沿って処理さ
+れます。
+
 
 @node Address Book, Customization, Split messages, Top
 @chapter アドレス帳
diff --git a/doc/wl.texi b/doc/wl.texi
index 55ae6d2..70d57dc 100644
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -3665,6 +3665,12 @@ Pipe content of each message with target mark @samp{*} to some specified
 external process.
 (@code{wl-summary-target-mark-pipe})
 
+@item D
+@kindex D (Summary)
+@findex wl-summary-erase
+Actually erase the message at once, without moving it to trash.
+(@code{wl-summary-erase})
+
 @item M-t
 @kindex M-t (Summary)
 @findex wl-toggle-plugged
@@ -4704,11 +4710,25 @@ The initial setting is 7.
 If @code{wl-template-visible-select} is non-nil, this variable specifies
 the size of the preview window.
 
+@item wl-draft-buffer-style
+@vindex wl-draft-buffer-style
+The initial setting is @code{full}.
+Style of draft buffer window (except for replying and forwarding).
+@code{keep} is to use current window,
+@code{full} is to use full frame window,
+@code{split} is to split current window and use it.
+If some function is specified, it is called with the draft buffer
+as an argument.
+
 @item wl-draft-reply-buffer-style
 @vindex wl-draft-reply-buffer-style
-The initial setting is @code{split}.  @code{split} or @code{full} can be
-specified.  In the case of @code{full}, the whole frame will be used for
-a reply draft buffer when it is prepared.
+The initial setting is @code{split}.
+Style of draft buffer for replying and forwarding.
+@code{keep} is to use message buffer window,
+@code{full} is to use full frame window,
+@code{split} is to split message buffer window and use it.
+If some function is specified, it is called with the draft buffer
+as an argument.
 
 @item wl-draft-use-frame
 @vindex wl-draft-use-frame
@@ -6375,14 +6395,16 @@ example, please.
 The basic unit of the rule is a combination like
 
 @lisp
-(@samp{CONDITION} @samp{FOLDER} [@code{continue}])
+(@samp{CONDITION} @samp{ACTION} [@code{continue}])
 @end lisp
 
-The 1st element @samp{CONDITION} is a balanced expression (sexp). Its
-grammar will be explained below. The 2nd element @samp{FOLDER} is the
-name of the folder to split messages into. When the 3rd element
-@code{continue} is specified as symbol, evaluating rules is not stopped
-even when the condition is satisfied.
+If @samp{CONDITION} is true, @samp{ACTION} is performed.
+The 1st element @samp{CONDITION} is a condition represented by a
+balanced expression (sexp). Its grammar will be explained below.
+The 2nd element @samp{ACTION} is the name of the folder to split
+messages into, or a symbol. When the 3rd element @code{continue} is
+specified as symbol, evaluating rules is not stopped even when the
+condition is satisfied.
 
 The grammar for @samp{CONDITION} is as follows. See example above to
 learn how to write the condition practically.
@@ -6426,6 +6448,36 @@ A symbol.
 When a symbol is specified, it is evaluated.
 @end enumerate
 
+You can specify followings as 2nd @samp{ACTION}.
+
+@enumerate
+@item
+folder name
+
+If some string is specified, it will be regarded as the destination
+folder, and the message will be appended to it.
+
+@item
+@samp{delete}
+
+If the symbol  @samp{delete} is specified, delete the substance of the
+message in @code{elmo-split-folder}
+
+@item
+@samp{noop}
+
+If the symbol @samp{noop} is specified, do nothing on the message and
+keep it as it is.
+
+@item
+function
+
+If some function is specified, execute it.
+@end enumerate
+
+If the message passes all rules, it will be dealed along @samp{ACTION}
+specified by @code{elmo-split-default-action}.
+
 
 @node Address Book, Customization, Split messages, Top
 @chapter Address Book
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index c835591..6853766 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2565,7 +2565,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
     (unless elmo-inhibit-display-retrieval-progress
       (elmo-display-progress 'elmo-imap4-display-literal-progress
 			     "Retrieving..." 100)  ; remove progress bar.
-      (message "Retrieving...done."))
+      (message "Retrieving...done"))
     (if (setq response (elmo-imap4-response-bodydetail-text
 			(elmo-imap4-response-value-all
 			 response 'fetch)))
diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index 59e9a22..4459d24 100644
--- a/elmo/elmo-nmz.el
+++ b/elmo/elmo-nmz.el
@@ -153,7 +153,7 @@ If the value is a list, all elements are used as index paths for namazu."
 	 'elmo-folder-msgdb-create "Creating msgdb..."
 	 percent))
       (setq numlist (cdr numlist)))
-    (message "Creating msgdb...done.")
+    (message "Creating msgdb...done")
     (list overview number-alist mark-alist)))
 
 (luna-define-method elmo-folder-message-file-p ((folder elmo-nmz-folder))
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 64fd567..9c98ac3 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -883,7 +883,7 @@ If IF-EXISTS is `any-exists', get BIFF session or normal session if exists."
 	  (elmo-display-progress
 	   'elmo-display-retrieval-progress
 	   "Retrieving..." 100)  ; remove progress bar.
-	  (message "Retrieving...done."))
+	  (message "Retrieving...done"))
 	(set-buffer outbuf)
 	(goto-char (point-min))
 	(while (re-search-forward "^\\." nil t)
diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el
index 0a55ec1..25bf6d0 100644
--- a/elmo/elmo-shimbun.el
+++ b/elmo/elmo-shimbun.el
@@ -379,7 +379,7 @@ update overview when message is fetched."
 	 'elmo-folder-msgdb-create "Creating msgdb..."
 	 percent))
       (setq numlist (cdr numlist)))
-    (message "Creating msgdb...done.")
+    (message "Creating msgdb...done")
     (elmo-msgdb-sort-by-date
      (list overview number-alist mark-alist))))
 
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 9690154..6157174 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -773,7 +773,7 @@ the directory becomes empty after deletion."
       (setq clist2 (delq (car list1) clist2))
       (setq list1 (cdr list1)))
     (if mes
-	(message (concat mes "done.")))
+	(message (concat mes "done")))
     (list clist1 clist2)))
 
 (defun elmo-list-bigger-diff (list1 list2 &optional mes)
diff --git a/utils/wl-addrbook.el b/utils/wl-addrbook.el
index f71f928..d9fd2dd 100644
--- a/utils/wl-addrbook.el
+++ b/utils/wl-addrbook.el
@@ -164,7 +164,7 @@ If nil,  the old 'user' entry remains.")
   (wl-addrbook-make-hashtb)
   (add-hook 'kill-emacs-hook (function wl-addrbook-clean-up))
   (add-hook 'wl-exit-hook (function wl-addrbook-clean-up))
-  (message "Updating addrbook...done."))
+  (message "Updating addrbook...done"))
 
 (defun wl-addrbook-clean-up ()
   (remove-hook 'kill-emacs-hook (function wl-addrbook-clean-up))
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0f324f1..b16246b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,8 +1,38 @@
+2002-11-14  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-mime.el (wl-message-verify-pgp-nonmime): Verify sign in the
+	original contents.
+
 2002-11-13  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-util.el (wl-biff-check-folder): Call elmo-pop3-get-session
 	with argument 'any-exists.
 
+2002-11-13  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-mime.el (wl-message-decrypt-pgp-nonmime): Fix the last change.
+	Use `wl-cs-autoconv'.
+
+2002-11-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-mime.el (wl-message-decrypt-pgp-nonmime): Decode PGP output
+	by `mime-view-automatic-conversion'.
+
+	* wl-mime.el (wl-message-decrypt-pgp-nonmime): New function.
+	(wl-message-verify-pgp-nonmime): Ditto.
+	* wl-e21.el, wl-mule.el, wl-xmas.el (wl-message-define-keymap):
+	Bind them to C-c:d and C-c:v respectively.
+
+	Merge following code by Teranishi-san from [wl-en:00167].
+	* wl-mime.el (wl-mime-preview-application/pgp): New function.
+	(wl-mime-preview-application/pgp-encrypted): Ditto.
+	(wl-mime-setup): Add entry.
+
+2002-11-10  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-summary.el (wl-summary-target-mark-erase): New function.
+	Bind it to "mD".
+
 2002-11-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (wl-draft-write-file-function): Fix.
diff --git a/wl/wl-address.el b/wl/wl-address.el
index dfa2a72..d168f52 100644
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -368,7 +368,7 @@ Matched address lists are append to CL."
     (with-output-to-temp-buffer
 	wl-completion-buf-name
       (display-completion-list all))
-    (message "Making completion list... done")))
+    (message "Making completion list...done")))
 
 (defun wl-complete-window-delete ()
   (let (comp-buf comp-win)
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 49110ef..9fae1d9 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -530,6 +530,8 @@
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "D" 'wl-message-delete-current-part)
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
+    (define-key keymap "\C-c:d" 'wl-message-decrypt-pgp-nonmime)
+    (define-key keymap "\C-c:v" 'wl-message-verify-pgp-nonmime)
     (define-key keymap [mouse-4] 'wl-message-wheel-down)
     (define-key keymap [mouse-5] 'wl-message-wheel-up)
     (define-key keymap [S-mouse-4] 'wl-message-wheel-down)
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 19e2fc0..393ec98 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -34,6 +34,11 @@
 (require 'mime-play)
 (require 'elmo)
 
+(eval-when-compile
+  (defalias-maybe 'pgg-decrypt-region 'ignore)
+  (defalias-maybe 'pgg-display-output-buffer 'ignore)
+  (defalias-maybe 'pgg-verify-region 'ignore))
+
 ;;; Draft
 
 (defalias 'wl-draft-editor-mode 'mime-edit-mode)
@@ -288,6 +293,111 @@ It calls following-method selected from variable
 	(wl-summary-toggle-disp-msg 'off)
 	(wl-summary-sync nil "update")))))
 
+(defun wl-message-decrypt-pgp-nonmime ()
+  "Decrypt PGP encrypted region"
+  (interactive)
+  (require 'pgg)
+  (save-excursion
+    (beginning-of-line)
+    (if (or (re-search-forward "^-+END PGP MESSAGE-+$" nil t)
+	    (re-search-backward "^-+END PGP MESSAGE-+$" nil t))
+	(let (beg end status)
+	  (setq end (match-end 0))
+	  (if (setq beg (re-search-backward "^-+BEGIN PGP MESSAGE-+$" nil t))
+	      (let ((inhibit-read-only t)
+		    (buffer-file-coding-system wl-cs-autoconv))
+		(setq status (pgg-decrypt-region beg end))
+		(pgg-display-output-buffer beg end status))
+	    (message "Cannot find pgp encrypted region")))
+      (message "Cannot find pgp encrypted region"))))
+
+(defun wl-message-verify-pgp-nonmime ()
+  "Verify PGP signed region"
+  (interactive)
+  (require 'pgg)
+  (save-excursion
+    (beginning-of-line)
+    (if (and (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
+		 (re-search-backward "^-+END PGP SIGNATURE-+$" nil t))
+	     (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
+	(let (status m-beg)
+	  (let* ((beg (point))
+		 (situation (mime-preview-find-boundary-info))
+		 (p-end (aref situation 1))
+		 (entity (aref situation 2))
+		 (count 0))
+	    (goto-char p-end)
+	    (while (< beg (point))
+	      (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+		  (setq count (+ count 1))
+		(defbug)))
+	    (with-temp-buffer
+	      (set-buffer-multibyte nil)
+	      (insert (mime-entity-body entity))
+	      (goto-char (point-max))
+	      (while (> count 0)
+		(if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+		    (setq count (- count 1))
+		  (debug)))
+	      (let ((r-beg (point))
+		    (r-end (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)))
+		(if r-end
+		    (setq status (pgg-verify-region r-beg r-end nil 'fetch))
+		  (debug)))))
+	  (mime-show-echo-buffer)
+	  (set-buffer mime-echo-buffer-name)
+	  (set-window-start
+	   (get-buffer-window mime-echo-buffer-name)
+	   (point-max))
+	  (setq m-beg (point))
+	  (insert-buffer-substring
+	   (if status pgg-output-buffer pgg-errors-buffer))
+	  (decode-coding-region m-beg (point) wl-cs-autoconv))
+      (message "Cannot find pgp signed region"))))
+
+;; XXX: encrypted multipart isn't represented as multipart
+(defun wl-mime-preview-application/pgp (parent-entity entity situation)
+  (require 'pgg)
+  (goto-char (point-max))
+  (let ((p (point))
+	raw-buf to-buf representation-type child-entity)
+    (goto-char p)
+    (save-restriction
+      (narrow-to-region p p)
+      (setq to-buf (current-buffer))
+      (with-temp-buffer
+	(setq raw-buf (current-buffer))
+	(mime-insert-entity entity)
+	(when (progn
+		(goto-char (point-min))
+		(re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
+	  (pgg-decrypt-region (point-min)(point-max))
+	  (delete-region (point-min) (point-max))
+	  (insert-buffer pgg-output-buffer)
+	  (setq representation-type 'elmo-buffer))
+	(setq child-entity (mime-parse-message
+			    (mm-expand-class-name representation-type)
+			    nil
+			    parent-entity
+			    (mime-entity-node-id-internal parent-entity)))
+	(mime-display-entity
+	 child-entity
+	 nil
+	 `((header . visible)
+	   (body . visible)
+	   (entity-button . invisible))
+	 to-buf)))))
+
+(defun wl-mime-preview-application/pgp-encrypted (entity situation)
+  (let* ((entity-node-id (mime-entity-node-id entity))
+	 (mother (mime-entity-parent entity))
+	 (knum (car entity-node-id))
+	 (onum (if (> knum 0)
+		   (1- knum)
+		 (1+ knum)))
+	 (orig-entity (nth onum (mime-entity-children mother))))
+    (wl-mime-preview-application/pgp entity orig-entity situation)))
+
 ;;; Summary
 (defun wl-summary-burst-subr (message-entity target number)
   ;; returns new number.
@@ -463,6 +573,14 @@ With ARG, ask destination folder."
      (major-mode . wl-original-message-mode)))
 
   (ctree-set-calist-strictly
+   'mime-preview-condition
+   '((type . application)(subtype . pgp-encrypted)
+     (encoding . t)
+     (body . invisible)
+     (body-presentation-method . wl-mime-preview-application/pgp-encrypted)
+     (major-mode . wl-original-message-mode)))
+
+  (ctree-set-calist-strictly
    'mime-acting-condition
    '((type . message) (subtype . partial)
      (method .  wl-mime-combine-message/partial-pieces)
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 985768d..75038c0 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -102,6 +102,8 @@ Special commands:
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "D" 'wl-message-delete-current-part)
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
+    (define-key keymap "\C-c:d" 'wl-message-decrypt-pgp-nonmime)
+    (define-key keymap "\C-c:v" 'wl-message-verify-pgp-nonmime)
     (define-key keymap [mouse-4] 'wl-message-wheel-down)
     (define-key keymap [mouse-5] 'wl-message-wheel-up)
     (define-key keymap [S-mouse-4] 'wl-message-wheel-down)
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 00cf296..f9d1b6b 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -506,6 +506,7 @@ See also variable `wl-use-petname'."
   (define-key wl-summary-mode-map "m?"   'wl-summary-target-mark-pick)
   (define-key wl-summary-mode-map "m#"   'wl-summary-target-mark-print)
   (define-key wl-summary-mode-map "m|"   'wl-summary-target-mark-pipe)
+  (define-key wl-summary-mode-map "mD"   'wl-summary-target-mark-erase)
 
   ;; region commands
   (define-key wl-summary-mode-map "r"    (make-sparse-keymap))
@@ -1111,7 +1112,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
   (elmo-folder-commit wl-summary-buffer-elmo-folder)
   (elmo-folder-check wl-summary-buffer-elmo-folder)
   (if wl-use-scoring (wl-score-save))
-  (if (interactive-p) (message "Saving summary status...done.")))
+  (if (interactive-p) (message "Saving summary status...done")))
 
 (defun wl-summary-force-exit ()
   "Exit current summary.  Buffer is deleted even the buffer is sticky."
@@ -2931,7 +2932,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 
 (defun wl-summary-exec-region (beg end)
   (interactive "r")
-  (message "Collecting marks ...")
+  (message "Collecting marks...")
   (save-excursion
     (goto-char beg)
     (beginning-of-line)
@@ -2957,7 +2958,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 	    refile-len
 	    dst-msgs			; loop counter
 	    result)
-	(message "Executing ...")
+	(message "Executing...")
 	(while dels
 	  (when (not (assq (car dels) wl-summary-buffer-refile-list))
 	    (wl-append wl-summary-buffer-refile-list
@@ -3045,7 +3046,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 			   wl-message-buffer-cur-number)))
 	  (wl-summary-toggle-disp-msg 'off))
 	(set-buffer-modified-p nil)
-	(message (concat "Executing ... done"
+	(message (concat "Executing...done"
 			 (if (> refile-failures 0)
 			     (format " (%d refiling failed)" refile-failures)
 			   "")
@@ -3077,6 +3078,21 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 	      (save-excursion (wl-summary-sync nil "update"))))))
     (message "Read-only folder.")))
 
+(defun wl-summary-target-mark-erase ()
+  (interactive)
+  (if (elmo-folder-writable-p wl-summary-buffer-elmo-folder)
+      (if (null wl-summary-buffer-target-mark-list)
+	  (message "No marked message.")
+	(when (yes-or-no-p
+	       "Erase all marked messages without moving them to trash? ")
+	  (while (car wl-summary-buffer-target-mark-list)
+	    (let ((num (car wl-summary-buffer-target-mark-list)))
+	      (wl-summary-unmark num)
+	      (elmo-folder-delete-messages wl-summary-buffer-elmo-folder
+					   (list num))))
+	  (save-excursion (wl-summary-sync nil "update"))))
+    (message "Read-only folder.")))
+
 (defun wl-summary-read-folder (default &optional purpose ignore-error
 				no-create init)
   (let ((fld (completing-read
@@ -3709,7 +3725,7 @@ If ARG, exit virtual folder."
 	  (setq skipped (cons (car mlist) skipped)))
 	(setq mlist (cdr mlist)))
       (setq wl-summary-buffer-target-mark-list skipped)
-      (message "Prefetching... %d/%d message(s)." count length)
+      (message "Prefetching... %d/%d message(s)" count length)
       (set-buffer-modified-p nil))))
 
 (defun wl-summary-target-mark-refile-subr (copy-or-refile)
diff --git a/wl/wl-util.el b/wl/wl-util.el
index e6bd8aa..04f5468 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -667,7 +667,7 @@ that `read' can handle, whenever this is possible."
 (defvar wl-load-profile-function 'wl-local-load-profile)
 (defun wl-local-load-profile ()
   "Load `wl-init-file'."
-  (message "Initializing ...")
+  (message "Initializing...")
   (load wl-init-file 'noerror 'nomessage))
 
 (defun wl-load-profile ()
diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 93da3a2..6667d89 100644
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -448,6 +448,8 @@
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "D" 'wl-message-delete-current-part)
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
+    (define-key keymap "\C-c:d" 'wl-message-decrypt-pgp-nonmime)
+    (define-key keymap "\C-c:v" 'wl-message-verify-pgp-nonmime)
     (define-key keymap 'button4 'wl-message-wheel-down)
     (define-key keymap 'button5 'wl-message-wheel-up)
     (define-key keymap [(shift button4)] 'wl-message-wheel-down)