Synch up with main trunk.
authorteranisi <teranisi>
Thu, 14 Nov 2002 13:17:38 +0000 (13:17 +0000)
committerteranisi <teranisi>
Thu, 14 Nov 2002 13:17:38 +0000 (13:17 +0000)
16 files changed:
doc/wl-ja.texi
doc/wl.texi
elmo/elmo-imap4.el
elmo/elmo-nmz.el
elmo/elmo-pop3.el
elmo/elmo-shimbun.el
elmo/elmo-util.el
utils/wl-addrbook.el
wl/ChangeLog
wl/wl-address.el
wl/wl-e21.el
wl/wl-mime.el
wl/wl-mule.el
wl/wl-summary.el
wl/wl-util.el
wl/wl-xmas.el

index 90a78c3..91a7298 100644 (file)
@@ -3648,6 +3648,12 @@ prefix argument \e$B$D$-$J$i$P4{$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b\e(B
 \e$B;XDj$7$?B>$N%W%m%;%9$K%Q%$%W7PM3$G0z$-EO$7$^$9!#\e(B
 (@code{wl-summary-target-mark-pipe})
 
+@item D
+@kindex D (Summary)
+@findex wl-summary-erase
+\e$B$4$_H"$K0\F0$;$:$K!"$=$N>l$G<B:]$K%a%C%;!<%8$r:o=|$7$^$9!#\e(B
+(@code{wl-summary-erase})
+
 @item M-t
 @kindex M-t (Summary)
 @findex wl-toggle-plugged
@@ -4653,12 +4659,23 @@ Non-nil \e$B$J$i%&%#%s%I%&$rI=<($7$J$,$i%F%s%W%l!<%H$rA*Br$9$k>l9g!"%j%?!<%s\e(B
 @code{wl-template-visible-select}\e$B$,\e(B non-nil \e$B$N>l9g!"\e(B
 \e$BE,MQ8e$N>uBV$rI=<($9$k%&%#%s%I%&$NBg$-$5$r;XDj$7$^$9!#\e(B
 
+@item wl-draft-buffer-style
+@vindex wl-draft-buffer-style
+\e$B=i4|@_Dj$O\e(B @code{full}\e$B!#\e(B
+(\e$BJV?.$HE>Aw$N>l9g0J30$N\e(B)\e$B%I%i%U%H%P%C%U%!$N%&%$%s%I%&$N7ABV$r;XDj$7$^$9!#\e(B
+@code{keep} \e$B$H$9$k$H8=:_$N%&%#%s%I%&$r;H$$!"\e(B
+@code{full} \e$B$H$9$k$H%U%l!<%`A4BN$N%&%$%s%I%&$r;H$$$^$9!#\e(B
+@code{split} \e$B$H$9$k$H8=:_$N%&%#%s%I%&$rJ,3d$7$F;H$$$^$9!#\e(B
+\e$B4X?t$,;XDj$5$l$?>l9g!"%I%i%U%H%P%C%U%!$r0z?t$H$7$F$=$l8F$S=P$7$^$9!#\e(B
+
 @item wl-draft-reply-buffer-style
 @vindex wl-draft-reply-buffer-style
 \e$B=i4|@_Dj$O\e(B @code{split}\e$B!#\e(B
-@code{split} \e$B$H\e(B @code{full} \e$B$,;XDj$G$-$^$9!#\e(B
-@code{full} \e$B$J$iJV;v$r=q$/$H$-$K%U%l!<%`A4BN$r;H$C$?%I%i%U%H%P%C%U%!$,\e(B
-\e$BMQ0U$5$l$^$9!#\e(B
+\e$BJV?.$HE>Aw$N>l9g$N%I%i%U%H%P%C%U%!$N%&%$%s%I%&$N7ABV$r;XDj$7$^$9!#\e(B
+@code{keep} \e$B$H$9$k$H%a%C%;!<%8%P%C%U%!$N%&%#%s%I%&$r;H$$!"\e(B
+@code{full} \e$B$H$9$k$H%U%l!<%`A4BN$N%&%$%s%I%&$r;H$$$^$9!#\e(B
+@code{split} \e$B$H$9$k$H%a%C%;!<%8%P%C%U%!$N%&%#%s%I%&$rJ,3d$7$F;H$$$^$9!#\e(B
+\e$B4X?t$,;XDj$5$l$?>l9g!"%I%i%U%H%P%C%U%!$r0z?t$H$7$F$=$l8F$S=P$7$^$9!#\e(B
 
 @item wl-draft-use-frame
 @vindex wl-draft-use-frame
@@ -6286,17 +6303,18 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 \e$B5,B'$N4pK\C10L$O\e(B
 
 @lisp
-(@samp{\e$B>r7o\e(B} @samp{\e$B%U%)%k%@\e(B} [@code{continue}])
+(@samp{CONDITION} @samp{ACTION} [@code{continue}])
 @end lisp
 
-\e$B$H$$$&0lAH$G$9!#\e(B
-\e$BBh0l$NMWAG\e(B @samp{\e$B>r7o\e(B} \e$B$O\e(B S \e$B<0$G$9!#=q<0$K$D$$$F$O$9$08e$G@bL@$7$^$9!#\e(B
-\e$BBhFs$NMWAG\e(B @samp{\e$B%U%)%k%@\e(B} \e$B$O%a%C%;!<%8$N?6$jJ,$1@h$N%U%)%k%@L>$G$9!#\e(B
-\e$B$b$7Bh;0$NMWAG\e(B @code{continue} \e$B$,%7%s%\%k$H$7$FM?$($i$l$k$H!"\e(B
-\e$B$=$N>r7o$,K~$?$5$l$?$H$7$F$b?6$jJ,$15,B'$NI>2A$rB3$1$^$9!#\e(B
+\e$B$H$$$&0lAH$G!"\e(B@samp{CONDITION} \e$B$,??$N>l9g$K\e(B @samp{ACTION} \e$B$r<B9T$7$^$9!#\e(B
+\e$BBh0l$NMWAG\e(B @samp{CONDITION} \e$B$K$O>r7o$r\e(B S \e$B<0$G5-=R$7$^$9!#=q<0$K$D$$$F$O\e(B
+\e$B$9$08e$G@bL@$7$^$9!#BhFs$NMWAG\e(B @samp{ACTION} \e$B$K$O%a%C%;!<%8$N?6$jJ,$1@h\e(B
+\e$B$N%U%)%k%@L>!"$b$7$/$O%7%s%\%k$r;XDj$7$^$9!#\e(B
+\e$BBh;0$NMWAG\e(B @code{continue} \e$B$r%7%s%\%k$H$7$FM?$($k$H!"\e(B@samp{CONDITION} \e$B$,\e(B
+\e$BK~$?$5$l$?>l9g$K$b?6$jJ,$15,B'$NI>2A$r7QB3$7$^$9!#\e(B
 
-@samp{\e$B>r7o\e(B} \e$B$N5-K!$O0J2<$N$h$&$K$J$j$^$9!#<B:]$N=q$-J}$O>e$G5s$2$?Nc$r\e(B
-\e$B;29M$K$7$F2<$5$$!#\e(B
+@samp{CONDITION} \e$B$N5-K!$O0J2<$N$h$&$K$J$j$^$9!#<B:]$N=q$-J}$O>e$G5s$2$?\e(B
+\e$BNc$r;29M$K$7$F2<$5$$!#\e(B
 
 @enumerate
 @item
@@ -6338,6 +6356,37 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 \e$B%7%s%\%k$,;XDj$5$l$k$H!"$=$l$rI>2A$7$^$9!#\e(B
 @end enumerate
 
+@samp{ACTION} \e$B$NCM$H$7$F;XDj$G$-$k$N$O0J2<$N$$$:$l$+$G$9!#\e(B
+
+@enumerate
+@item
+\e$B%U%)%k%@L>\e(B
+
+\e$BJ8;zNs$,;XDj$5$l$k$H$=$l$r?6$jJ,$1@h$N%U%)%k%@L>$H$_$J$7$F!"$=$N%U%)%k%@\e(B
+\e$B$X%a%C%;!<%8$rDI2C$7$^$9!#\e(B
+
+@item
+@samp{delete}
+
+\e$B%7%s%\%k\e(B @samp{delete} \e$B$,;XDj$5$l$k$H\e(B @code{elmo-split-folder} \e$BFb$K$"$k\e(B
+\e$B%a%C%;!<%8$N<BBN$r:o=|$7$^$9!#\e(B
+
+@item
+@samp{noop}
+
+\e$B%7%s%\%k\e(B @samp{noop} \e$B$,;XDj$5$l$?>l9g!"$=$N%a%C%;!<%8$KBP$7$F$O2?$b$;$:!"\e(B
+\e$B$=$N$^$^$N>uBV$KJ]$A$^$9!#\e(B
+
+@item
+\e$B4X?t\e(B
+
+\e$B4X?t$,;XDj$5$l$?>l9g!"$=$l$r<B9T$7$^$9!#\e(B
+@end enumerate
+
+\e$BA4$F$N?6$jJ,$15,B'$rDL2a$7$?%a%C%;!<%8$O!"JQ?t\e(B
+@code{elmo-split-default-action} \e$B$G;XDj$7$?\e(B @samp{ACTION} \e$B$K1h$C$F=hM}$5\e(B
+\e$B$l$^$9!#\e(B
+
 
 @node Address Book, Customization, Split messages, Top
 @chapter \e$B%"%I%l%9D"\e(B
index 55ae6d2..70d57dc 100644 (file)
@@ -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
index c835591..6853766 100644 (file)
@@ -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)))
index 59e9a22..4459d24 100644 (file)
@@ -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))
index 64fd567..9c98ac3 100644 (file)
@@ -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)
index 0a55ec1..25bf6d0 100644 (file)
@@ -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))))
 
index 9690154..6157174 100644 (file)
@@ -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)
index f71f928..d9fd2dd 100644 (file)
@@ -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))
index 0f324f1..b16246b 100644 (file)
@@ -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.
index dfa2a72..d168f52 100644 (file)
@@ -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)
index 49110ef..9fae1d9 100644 (file)
   (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)
index 19e2fc0..393ec98 100644 (file)
 (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)
index 985768d..75038c0 100644 (file)
@@ -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)
index 00cf296..f9d1b6b 100644 (file)
@@ -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)
index e6bd8aa..04f5468 100644 (file)
@@ -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 ()
index 93da3a2..6667d89 100644 (file)
   (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)