From 28c7eb0ddf6fb5ba3850cf690c457c73fd867a8a Mon Sep 17 00:00:00 2001 From: teranisi Date: Wed, 15 Nov 2000 01:25:38 +0000 Subject: [PATCH] Synch with wl-2_4. --- doc/wl-ja.texi | 52 +++++++++++++++++++++++++++-------------- doc/wl.texi | 61 +++++++++++++++++++++++++++++++------------------ elmo/ChangeLog | 14 ++++++++++++ elmo/elmo-internal.el | 35 ++++++++++++---------------- elmo/elmo-pop3.el | 1 + elmo/elmo-version.el | 2 +- etc/VERSION | 1 + samples/en/dot.wl | 7 ++++++ samples/ja/dot.wl | 7 ++++++ wl/ChangeLog | 24 +++++++++++++++++++ wl/wl-summary.el | 3 ++- wl/wl-thread.el | 28 +++++++++++++---------- wl/wl-util.el | 4 ++-- wl/wl.el | 2 +- 14 files changed, 165 insertions(+), 76 deletions(-) diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 23ec083..d06ce5b 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -5,7 +5,7 @@ @c %**end of header @documentlanguage ja @documentencoding iso-2022-jp -@set VERSION 2.5.0 +@set VERSION 2.5.1 @synindex pg cp @finalout @@ -789,10 +789,10 @@ default $BCM(B: $B$&$K;XDj$G$-$^$9!#(B $B%U%)%k%@L>$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL (Secure Socket Layer)$B$r(B -$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B@samp{!!} $B$@$H!"(BSTARTTLS$B$K$h$j(B -SSL$B%3%M%/%7%g%s$rD%$j$^$9!#(B -$BJQ?t(B @code{elmo-default-imap4-ssl} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B -$B$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttls $B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B +$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B@samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(BSSL$B%3%M%/(B +$B%7%g%s$rD%$j$^$9!#JQ?t(B @code{elmo-default-imap4-stream-type} $B$NCM$,(B +non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttls $B$J$i(B +@samp{!!} $B$r0UL#$7$^$9!#(B (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9(B $B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B @@ -895,7 +895,7 @@ default $BCM(B: @var{$B%f!<%6L>(B}$B$,(B non-nil $B$N>l9g$O(BAUTHINFO$B$K$h$kG'>Z$r9T$J$$$^$9!#(B $B%U%)%k%@L>$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL $B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B @samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(B SSL $B%3%M%/%7%g%s$rD%$j$^$9!#(B -$BJQ?t(B @code{elmo-default-nntp-ssl} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B +$BJQ?t(B @code{elmo-default-nntp-stream-type} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B $B$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} $B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9(B @@ -1299,7 +1299,7 @@ APOP $B$rMxMQ$9$k$K$O!"(B@file{md5.el} $B$,I,MW$G$9!#(B(XEmacs$B$G$OI,MW$"$ archive $B$+$iF~$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL $B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B -$BJQ?t(B @code{elmo-default-pop-ssl} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B +$BJQ?t(B @code{elmo-default-pop3-stream-type} $B$NCM$,(B non-nil $B$J$i!"(B@samp{!} $B$rIU$1(B $B$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} $B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9$k(B $BI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @file{openssl} $B$K%Q%9$,DL$C$F$$$k(B @@ -2442,6 +2442,11 @@ IMAP $B%U%)%k%@$N%a%C%;!<%8$d(B NNTP $B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$- $B%^%k%A%Q!<%H$NA`:n$O%a%C%;!<%8%P%C%U%!$K0\F0$7$F$+$i9T$$$^$9!#(B @xref{Message}. +@subsection $B%a%C%;!<%8HV9f$r5M$a$k(B +$B%5%^%j$G(B @kbd{M-x wl-summary-pack-number} $B$H$9$k$3$H$G(B +$B%a%C%;!<%8HV9f$r5M$a$k$3$H$,$G$-$^$9!#$?$@$7BP1~$7$F$$$k%U%)%k%@$Nr7o$G%5!<%P$H@\B3$7$^$9!#(B +@code{elmo-default-nntp-stream-type} $B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#(B @code{confirm} $B$J$i(B @code{elmo-default-nntp-*} $B$G;XDj$5$l$?%5!<%P$+$i8!(B $B:w$9$k$+!"%5!<%P$r;XDj$9$k$+$r3NG'$7$^$9!#$3$N>l9g!"%5!<%P$N%[%9%HL>!"$b(B @@ -3887,6 +3892,7 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B @subsection POP-before-SMTP$B$K$h$k%a!<%k$NAw?.(B @cindex POP-before-SMTP +@cindex SMTP-after-POP POP-before-SMTP$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#(B $B@_Dj$O!"(B @@ -3916,10 +3922,10 @@ POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$BG'>ZJ}<0$G$9!#(B POP-before-SMTP $B$GG'>Z$r9T$J$&$H$-$N(BPOP$B%]!<%HHV9f$G$9!#(B $B@_Dj$5$l$F$$$J$$>l9g$O(B @code{elmo-default-pop3-port} $B$,;H$o$l$^$9!#(B -@item wl-pop-before-smtp-ssl +@item wl-pop-before-smtp-stream-type Non-nil $B$J$i(B SSL $B$rMxMQ$7$F(B POP$B%3%M%/%7%g%s$rD%$j$^$9!#(B@code{starttls} $B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J(B -$B$$>l9g$O(B @code{elmo-default-pop3-ssl} $B$,;H$o$l$^$9!#(B +$B$$>l9g$O(B @code{elmo-default-pop3-stream-type} $B$,;H$o$l$^$9!#(B @end table POP-before-SMTP$BMQ$NJQ?t(B (@code{wl-pop-before-smtp-*})$B$,@_Dj$5$l$F$$$J$$(B @@ -4268,10 +4274,10 @@ SMTP$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#(B $B%K%e!<%9Ej9F;~$N(B NNTP $B%5!<%P$N%]!<%HHV9f!#(B @code{nil} $B$J$i(B @code{elmo-default-nntp-server} $B$r;H$$$^$9!#(B -@item wl-nntp-posting-ssl -@vindex wl-nntp-posting-ssl +@item wl-nntp-posting-stream-type +@vindex wl-nntp-posting-stream-type $B=i4|@_Dj$O(B @code{nil}$B!#(B -@code{nil} $B$J$i(B @code{elmo-default-nntp-ssl} $B$rI>2A$7$^$9!#(B +@code{nil} $B$J$i(B @code{elmo-default-nntp-stream-type} $B$rI>2A$7$^$9!#(B Non-nil $B$J$i%K%e!<%9Ej9F;~$K(B SSL $B$rMxMQ$7$^$9!#(B @code{starttls}$B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B @@ -4299,12 +4305,12 @@ POP-before-SMTP$B$G(BPOP$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#(B POP-before-SMTP$B$G(BPOP$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#(B @code{nil} $B$N$^$^$J$i(B @code{elmo-default-pop3-port}$B$rMxMQ$7$^$9!#(B -@item wl-pop-before-smtp-ssl -@vindex wl-pop-before-smtp-ssl +@item wl-pop-before-smtp-stream-type +@vindex wl-pop-before-smtp-stream-type $B=i4|@_Dj$O(B @code{nil}$B!#(B POP-before-SMTP $B$G(B SSL$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#(B@code{nil} $B$N(B -$B$^$^$J$i(B @code{elmo-default-pop3-ssl}$B$rMxMQ$7$^$9!#(B@code{starttls$B$J$i(B -STARTTLS} (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B +$B$^$^$J$i(B @code{elmo-default-pop3-stream-type}$B$rMxMQ$7$^$9!#(B +@code{starttls}$B$J$i(BSTARTTLS (RFC2595)$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#(B @item wl-draft-queue-save-variables @vindex wl-draft-queue-save-variables @@ -4352,6 +4358,13 @@ Non-nil$B$J$i(B LDAP $B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#(B @vindex wl-ldap-base $B=i4|@_Dj$O(B @samp{c=US}$B!#(B $B%"%I%l%9Jd40;~$N(B LDAP $B8!:w$N3+;OE@(B(base)$B$r;XDj$7$^$9!#(B + +@item wl-draft-remove-group-list-contents +@vindex wl-draft-remove-group-list-contents +$B=i4|@_Dj$O(B @code{t}$B!#(B +Non-nil$B$J$i%a!<%kAw?.$N:]$K08@h$+$i(B group-list $B$NFbMF$r:o=|$7$^$9(B +(group-list $B$H$O08@h$K4^$^$l$k(B @samp{Group: foo@@gohome.org, +bar@@gohome.org;}$B$N$h$&$J5-=R$r;X$7$^$9(B)$B!#(B @end table @@ -6183,6 +6196,11 @@ face $B$N@_Dj$O(B @file{.emacs} $B$K=q$/$3$H$O$G$-$J$$$N$G(B @file{~/.wl} $ $BF1MM$K$7$F!"(Bprefix argument $BIU$-$G(B @kbd{a} $B$r2!$7$?$H$-$NF0:n$,!"(B @code{wl-draft-reply-with-argument-list} $B$G@_Dj$G$-$^$9!#(B +$BCm!'(B $B<+J,$,=P$7$?%a!<%k$KJV?.$9$k:]$NF0:n$O!"$=$l$i$KBe$o$C$F(B +@code{wl-draft-reply-myself-without-argument-list}, +@code{wl-draft-reply-myself-with-argument-list} +$B$G;XDj$7$^$9!#(B + @node Thread Format, User-Agent Field, Draft for Reply, Advanced Settings @subsection $B%9%l%C%I$N8+$?$a(B diff --git a/doc/wl.texi b/doc/wl.texi index 24e0486..cda56c1 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -5,7 +5,7 @@ @c %**end of header @documentlanguage en @documentencoding us-ascii -@set VERSION 2.5.0 +@set VERSION 2.5.1 @synindex pg cp @finalout @@ -761,12 +761,12 @@ You can omit the @var{hostname} from folder names if you set For example, you can specify a folder as @samp{foo%imap@@gateway} even if you have to go through a firewall. -SSL (Secure Socket Layer) connection will be used if a folder name -ends with @samp{!}. Or, if the value of @code{elmo-default-imap4-ssl} is non-nil, -SSL will be the default connection. -If a folder name ends with @samp{!!}, STARTTLS connection will be established. -If the value of @code{elmo-default-imap4-ssl} is 'starttls, -STARTTLS will be the default connection. +SSL (Secure Socket Layer) connection will be used if a folder name ends +with @samp{!}. Or, if the value of @code{elmo-default-imap4-stream-type} +is non-nil, SSL will be the default connection. If a folder name ends +with @samp{!!}, STARTTLS connection will be established. If the value +of @code{elmo-default-imap4-stream-type} is @code{starttls}, STARTTLS +will be the default connection. If you specify @code{login}, @code{cram-md5} or @code{digest-md5} as authentication method, the password is sent in encoded form. But, if @@ -867,10 +867,10 @@ default: @end example AUTHINFO is used as authentication method if the @var{username} is non-nil. -SSL will be default method if @code{elmo-default-nntp-ssl} is non-nil even +SSL will be default method if @code{elmo-default-nntp-stream-type} is non-nil even if the folder name doesn't end with @samp{!}. If a folder name ends with @samp{!!}, STARTTLS connection will be established. -if the value of @code{elmo-default-nntp-ssl} is @code{starttls}, +if the value of @code{elmo-default-nntp-stream-type} is @code{starttls}, STARTTLS will be the default connection. Example: @@ -1270,10 +1270,10 @@ To use apop as an @var{authenticate-type}, @file{md5.el} is needed If the last character of the folder name is @samp{!}, Wanderlust connects to the POP server via SSL (Secure Socket Layer). If you set -non-nil value to @code{elmo-default-pop-ssl}, you don't have to put +non-nil value to @code{elmo-default-pop3-stream-type}, you don't have to put @samp{!} in the end of the folder name to use SSL. If a folder name ends with @samp{!!}, STARTTLS connection will be established. if the value -of @code{elmo-default-pop-ssl} is @code{starttls}, STARTTLS will be the +of @code{elmo-default-pop3-stream-type} is @code{starttls}, STARTTLS will be the default connection. @node Multi Folder, Filter Folder, POP Folder, Folders @@ -2427,6 +2427,11 @@ Enter message buffer by typing @kbd{j} key. To operate multipart, you have to enter to the message buffer. @xref{Message}. +@subsection Pack the Message Numbers +You can pack the message numbers in Summary by +@kbd{M-x wl-summary-pack-number}. Note that only MH Folder, +News Spool Folder and Maildir Folder are supported folder types. + @node Thread Operations, Cache, Usage of Summary Mode, Summary @section Thread Operations @@ -3497,7 +3502,7 @@ If non-nil and @code{wl-summary-jump-to-msg-by-message-id} failed, call @code{wl-summary-jump-to-msg-by-message-id-via-nntp} and search message from the NNTP server @code{elmo-default-nntp-server}. The value of @code{elmo-default-nntp-user}, @code{elmo-default-nntp-port}, -@code{elmo-default-nntp-ssl} are used. +@code{elmo-default-nntp-stream-type} are used. If @code{confirm}, server name can be specified. You can specify NNTP folder format like @samp{-:username@@servername:119!}. @@ -3926,10 +3931,10 @@ If unset, @code{elmo-default-pop3-authenticate-type} is used. The POP port number for POP-before-SMTP authentication. If unset, @code{elmo-default-pop3-port} is used. -@item wl-pop-before-smtp-ssl +@item wl-pop-before-smtp-stream-type If non-nil, POP connection is established using SSL. If @code{starttls}, STARTTLS (RFC2595) connection will be established. If -unset, @code{elmo-default-pop3-ssl} is used. +unset, @code{elmo-default-pop3-stream-type} is used. @end table If variables for POP-before-SMTP (@code{wl-pop-before-smtp-*}) are @@ -4303,10 +4308,10 @@ The initial setting is @code{nil}. This is the port number of the NNTP server used for news submission. If @code{nil}, @code{elmo-default-nntp-server} is used. -@item wl-nntp-posting-ssl -@vindex wl-nntp-posting-ssl +@item wl-nntp-posting-stream-type +@vindex wl-nntp-posting-stream-type The initial setting is @code{nil}. -If @code{nil}, @code{elmo-default-nntp-ssl} is evaluated. If non-nil, +If @code{nil}, @code{elmo-default-nntp-stream-type} is evaluated. If non-nil, SSL is used for news submission. If @code{starttls}, STARTTLS (RFC2595) connection will be established. @@ -4334,11 +4339,11 @@ The initial setting is @code{nil}. This is the POP port number for POP-before-SMTP. If it is @code{nil}, @code{elmo-default-pop3-port} is used. -@item wl-pop-before-smtp-ssl -@vindex wl-pop-before-smtp-ssl +@item wl-pop-before-smtp-stream-type +@vindex wl-pop-before-smtp-stream-type The initial setting is @code{nil}. This flag controls the use of SSL for POP-before-SMTP. If it is -@code{nil}, @code{elmo-default-pop3-ssl} is used. If @code{starttls}, +@code{nil}, @code{elmo-default-pop3-stream-type} is used. If @code{starttls}, STARTTLS (RFC2595) connection will be established. @item wl-draft-queue-save-variables @@ -4388,6 +4393,13 @@ If non-nil, the value is used as port number. @vindex wl-ldap-base The initial setting is @samp{c=US}. LDAP search starting point (base) for address completion. + +@item wl-draft-remove-group-list-contents +@vindex wl-draft-remove-group-list-contents +The initial setting is @code{t}. +If non-nil, remove the group-lists' members in the recipients when +sending the message (group-list means the description such as +@samp{Group: foo@@gohome.org, bar@@gohome.org;} in the recipients). @end table @node Disconnected Operations, Expire and Archive, Draft, Top @@ -6165,12 +6177,12 @@ folder mode. @item wl-highlight-folder-opened-face The face for open groups in the folder mode. -It is meaningful when @code{wl-highlight-group-folder-by-numbers} is +It is meaningful when @code{wl-highlight-folder-by-numbers} is @code{nil} or a @var{number}. @item wl-highlight-folder-closed-face The face for close groups in the folder mode. -It is meaningful when @code{wl-highlight-group-folder-by-numbers} is +It is meaningful when @code{wl-highlight-folder-by-numbers} is @code{nil} or a @var{number}. @item wl-highlight-folder-path-face @@ -6247,6 +6259,11 @@ copied to @samp{To:} field.) Moreover, the behavior of @kbd{a} with prefix argument can be directed by @code{wl-draft-reply-with-argument-list} as well. +Note: To set the behavior when you reply to the message written by yourself, use +@code{wl-draft-reply-myself-without-argument-list} and +@code{wl-draft-reply-myself-with-argument-list} +instead of them. + @node Thread Format, User-Agent Field, Draft for Reply, Advanced Settings @subsection Appearance of Threads diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 61f4403..56d4edc 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,19 @@ +2000-11-15 Yuuichi Teranishi + + * elmo-version.el (elmo-version): Up to 2.5.1. + +2000-11-13 Yuuichi Teranishi + + * elmo-pop3.el (elmo-pop3-folder-exists-p): Don't use UIDL. + + * elmo-internal.el (elmo-internal-search): Fix last change. + 2000-11-08 Yuuichi Teranishi + * elmo-internal.el (elmo-internal-search): Rewrite. + (Fixed problem which is pointed out by Akihiro MOTOKI + ) + * elmo-version.el (elmo-version): Up to 2.5.0. 2000-11-06 Kenichi OKADA diff --git a/elmo/elmo-internal.el b/elmo/elmo-internal.el index e198325..461287c 100644 --- a/elmo/elmo-internal.el +++ b/elmo/elmo-internal.el @@ -224,36 +224,31 @@ nil) (defun elmo-internal-search (spec condition &optional from-msgs msgdb) - (let* ((mark-alist - (or elmo-msgdb-global-mark-alist - (setq elmo-msgdb-global-mark-alist - (elmo-object-load (expand-file-name - elmo-msgdb-global-mark-filename - elmo-msgdb-dir))))) + (let* ((msgs (or from-msgs (elmo-internal-list-folder spec))) (loc-alist (if msgdb (elmo-msgdb-get-location msgdb) (elmo-msgdb-location-load (elmo-msgdb-expand-path spec)))) (number-list (mapcar 'car loc-alist)) + (i 0) + (num (length msgs)) cache-file - ret-val - case-fold-search msg - percent i num) - (setq num (length loc-alist)) - (setq i 0) - (while loc-alist - (if (and (setq cache-file (elmo-cache-exists-p (cdr (car loc-alist)))) + matched + case-fold-search) + (setq num (length msgs)) + (while msgs + (if (and (setq cache-file (elmo-cache-get-path (cdr (assq (car msgs) + loc-alist)))) + (file-exists-p cache-file) (elmo-file-field-condition-match cache-file condition - (car (car loc-alist)) + (car msgs) number-list)) - (setq ret-val (append ret-val (list (car (car loc-alist)))))) - (setq i (1+ i)) - (setq percent (/ (* i 100) num)) + (setq matched (nconc matched (list (car msgs))))) (elmo-display-progress 'elmo-internal-search "Searching..." - percent) - (setq loc-alist (cdr loc-alist))) - ret-val)) + (/ (* (setq i (1+ i)) 100) num)) + (setq msgs (cdr msgs))) + matched)) (defun elmo-internal-use-cache-p (spec number) nil) diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index dcdc32f..f39a37c 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -391,6 +391,7 @@ (elmo-pop3-plugged-p spec)) (save-excursion (let (elmo-auto-change-plugged ; don't change plug status. + elmo-pop3-use-uidl ; No need to use uidl. session) (prog1 (setq session (elmo-pop3-get-session spec)) diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el index e0b211c..18ec08c 100644 --- a/elmo/elmo-version.el +++ b/elmo/elmo-version.el @@ -35,7 +35,7 @@ ;; product-define in the first place (product-provide 'elmo-version - (product-define "ELMO" nil '(2 5 0))) + (product-define "ELMO" nil '(2 5 1))) ;; For APEL 10.2 or earlier. (defun-maybe product-version-as-string (product) diff --git a/etc/VERSION b/etc/VERSION index 476d650..b4e7ee7 100644 --- a/etc/VERSION +++ b/etc/VERSION @@ -108,4 +108,5 @@ 2.3.x Roam 2.4.0 Rio + 2.5.x Smooth diff --git a/samples/en/dot.wl b/samples/en/dot.wl index 2d293aa..1dceb11 100644 --- a/samples/en/dot.wl +++ b/samples/en/dot.wl @@ -221,6 +221,13 @@ ;;"e-mail2@bbb.com" ... )) +;; Subscribed mailing list +(setq wl-subscribed-mailing-list + '("wl@lists.airs.net" + "apel-ja@m17n.org" + ;;"ml@example.com" ... + )) + ;; Change summary display function. ;; get extra field values as overview information (only localdir folder). diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl index c70bd88..e8a8d77 100644 --- a/samples/ja/dot.wl +++ b/samples/ja/dot.wl @@ -222,6 +222,13 @@ ;;"e-mail2@bbb.com" ... )) +;; $B<+J,$N;22C$7$F$$$k%a!<%j%s%0%j%9%H$N%j%9%H(B +(setq wl-subscribed-mailing-list + '("wl@lists.airs.net" + "apel-ja@m17n.org" + ;;"ml@example.com" ... + )) + ;; $B%5%^%jI=<(4X?t$rJQ99$9$k(B ;; $B%5%^%jI=<($K$*$$$F;HMQ$9$k>pJs$r;}$D%U%#!<%k%I$r(Boverview$B>pJs$K(B diff --git a/wl/ChangeLog b/wl/ChangeLog index 91fd097..f386c7a 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,27 @@ +2000-11-15 Yuuichi Teranishi + + * Version number is increased to 2.5.1. + +2000-11-14 Yuuichi Teranishi + + * wl-thread.el (wl-thread-update-line-on-buffer-sub): + Print refile/copy destination. + +2000-11-13 Yuuichi Teranishi + + * wl.el (wl-toggle-plugged): Don't call `wl-biff-start' if + queue-flush-only is non-nil. + + * wl-util.el (wl-biff-check-folder-async): Fix close parenthesis. + + * wl-summary.el (wl-summary-refile-subr): Use folder realname while + checking cache folder. + +2000-11-09 TAKAHASHI Kaoru + + * wl-folder.el (wl-folder-guess-mailing-list-by-folder-name): Use + `regexp-quote'. + 2000-11-08 TAKAHASHI Kaoru * wl-folder.el (wl-folder-guess-mailing-list-by-folder-name): New diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 33ca8c1..c41276e 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -3522,7 +3522,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (or (wl-refile-guess entity) wl-trash-folder) (format "for %s" copy-or-refile))))) ;; Cache folder hack by okada@opaopa.org - (if (and (eq (car (elmo-folder-get-spec folder)) 'cache) + (if (and (eq (car (elmo-folder-get-spec + (wl-folder-get-realname folder))) 'cache) (not (string= folder (setq tmp-folder (concat "'cache/" diff --git a/wl/wl-thread.el b/wl/wl-thread.el index bf84f1b..e028615 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -662,19 +662,19 @@ The closed parent will be opened." (mark-alist (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb)) (buffer-read-only nil) (inhibit-read-only t) - overview-entity temp-mark summary-line invisible-top) + overview-entity temp-mark summary-line invisible-top dest-pair) (if (wl-thread-delete-line-from-buffer msg) (progn - (if (memq msg wl-summary-buffer-delete-list) - (setq temp-mark "D")) - (if (memq msg wl-summary-buffer-target-mark-list) - (setq temp-mark "*")) - (if (assq msg wl-summary-buffer-refile-list) - (setq temp-mark "o")) - (if (assq msg wl-summary-buffer-copy-list) - (setq temp-mark "O")) - (unless temp-mark - (setq temp-mark (wl-summary-get-score-mark msg))) + (cond + ((memq msg wl-summary-buffer-delete-list) + (setq temp-mark "D")) + ((memq msg wl-summary-buffer-target-mark-list) + (setq temp-mark "*")) + ((setq dest-pair (assq msg wl-summary-buffer-refile-list)) + (setq temp-mark "o")) + ((setq dest-pair (assq msg wl-summary-buffer-copy-list)) + (setq temp-mark "O")) + (t (setq temp-mark (wl-summary-get-score-mark msg)))) (when (setq overview-entity (elmo-msgdb-overview-get-entity msg wl-summary-buffer-msgdb)) @@ -690,7 +690,11 @@ The closed parent will be opened." nil (wl-thread-maybe-get-children-num msg)) temp-mark entity)) - (wl-summary-insert-line summary-line))) + (save-excursion + (wl-summary-insert-line summary-line)) + (if dest-pair + (wl-summary-print-destination (car dest-pair) + (cdr dest-pair))))) ;; insert thread (moving thread) (if (not (setq invisible-top (wl-thread-entity-parent-invisible-p entity))) diff --git a/wl/wl-util.el b/wl/wl-util.el index 1cff4a1..eeec0e5 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -894,7 +894,7 @@ This function is imported from Emacs 20.7." (let ((elmo-network-session-name-prefix "BIFF-")) (elmo-folder-diff-async folder))) (wl-biff-notify (car (wl-biff-check-folder folder)) - notify-minibuf)) - (setq wl-biff-check-folders-running nil)))) + notify-minibuf) + (setq wl-biff-check-folders-running nil))))) ;;; wl-util.el ends here diff --git a/wl/wl.el b/wl/wl.el index d150b1f..d9312bf 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -113,7 +113,7 @@ (progn ;; flush queue!! (elmo-dop-queue-flush) - (wl-biff-start) + (unless queue-flush-only (wl-biff-start)) (if (and wl-draft-enable-queuing wl-auto-flush-queue) (wl-draft-queue-flush)) -- 1.7.10.4