From: teranisi Date: Sat, 12 Feb 2005 12:40:08 +0000 (+0000) Subject: Synch up with main trunk. X-Git-Tag: wl-2_12_1~8 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=18c2440c04517eef1022068a0c43ec76d60ddc9c;p=elisp%2Fwanderlust.git Synch up with main trunk. --- diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index a16980c..abaacf6 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -4280,6 +4280,12 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8 $B=i4|@_Dj$O(B @code{t}$B!#(BNon-nil $B$J$i!"?7J9%U%)%k%@$GFI$s$@%a%C%;!<%8$r(B $B%-%c%C%7%e$7$^$9!#(B +@item wl-summary-resend-use-cache +@vindex wl-summary-resend-use-cache +$B=i4|@_Dj$O(B @code{nil}$B!#(BNon-nil $B$O$i!"%*%U%i%$%s>uBV$G$b%-%c%C%7%e$r(B +$B;H$C$F:FAw$7$^$9!#%-%c%C%7%e$rMQ$$$F:FAw$9$k$H!"I,$:$7$b0U?^$7$?(B +$B%a%C%;!<%8$,;H$o$l$k$H$O8B$i$J$$$3$H$KN10U$7$F$/$@$5$$!#(B + @item wl-folder-process-duplicates-alist @vindex wl-folder-process-duplicates-alist $B=i4|@_Dj$O(B @code{nil}$B!#=EJ#$7$?%a%C%;!<%8$,F1$8%U%)%k%@$K$"$k>l9g$NF0:n(B @@ -8601,6 +8607,13 @@ Non-nil $B$J$i$P%*%U%i%$%s=hM}$GN/$C$?=hM}$rl9g$O(B $B?JD=I=<($7$^$9!#(B + +@item elmo-network-session-idle-timeout +@vindex elmo-network-session-idle-timeout +$B=i4|@_Dj$O(B @code{nil}$B!#(B +$B%M%C%H%o!<%/%;%C%7%g%s$r%-%c%C%7%e$9$k%"%$%I%k;~4V$rIC$G;XDj$7$^$9!#(B +$B$3$3$G;XDj$5$l$?CM$h$j$bD9$$;~4V!"$J$K$bDL?.$,9T$J$o$l$J$+$C$?>l9g!"(B +$B$=$N%;%C%7%g%s$O:FMxMQ$5$l$^$;$s!#(Bnil $B$J$i!"L5>r7o$K:FMxMQ$7$^$9!#(B @end table @@ -8847,6 +8860,7 @@ Wanderlust List in English @t{} 2/09 'file' $B%U%)%k%@!#(B 9/12 forwarded $B%^!<%/!#(B $B%^!<%/J8;zNs$N%G%U%)%k%HCMJQ99!#(B + 12/24 2.12.0 stable $B%j%j!<%9!#(B @end example $B>\$7$$JQA+$O(B @file{ChangeLog} $B$r8fMw$/$@$5$$!#(B @@ -8875,7 +8889,7 @@ elmo $B$O!"(B@samp{Elisp Library for Message Orchestration} $B$NN,$G$9!#(B $B3F%P!<%8%g%s$K$O%3!<%I%M!<%`$,$D$$$F$$$^$9(B($B$[$H$s$I>iCL$G$9(B)$B!#(B $B$$$^$N$H$3$m(B 1980 $BG/Be$NJF%S%k%\!<%I;o%H%C%W(B 40 $B%R%C%H(B -(@uref{http://lyrics.natalnet.com.br/html/top40/index.html}) +(@uref{http://ntl.matrix.com.br/pfilho/html/top40/}) @noindent $B$+$i%"%k%U%!%Y%C%H=g$KE,Ev$K9%$-$J$b$N$r%T%C%/%"%C%W$7$F;H$C$F$$$^$9!#(B diff --git a/doc/wl.texi b/doc/wl.texi index f44bc47..27cae29 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -4300,6 +4300,12 @@ cached. The initial setting is @code{t}. If non-nil, messages read in Shimbun folders are cached. +@item wl-summary-resend-use-cache +@vindex wl-summary-resend-use-cache +The initial setting is @code{nil}¡£If non-nil, messages are resend +using cache even in the offline status. Note that if you use cache, +the message identity is not guaranteed. + @item wl-folder-process-duplicates-alist @vindex wl-folder-process-duplicates-alist The initial setting is @code{nil}. @@ -8669,6 +8675,14 @@ operations are executed. The initial setting is 20. Threshold for display of progress gauge. If number of renewal is more than this value, display progress gauge. + +@item elmo-network-session-idle-timeout +@vindex elmo-network-session-idle-timeout +The initial setting is @code{nil}. +Idle timeout of the network cache. Specified in seconds. +If elapsed time since last access is larger than this value, +cached session is not reused. If nil, network cache is reused. + @end table @@ -8915,6 +8929,7 @@ Read messages posted to @t{} 2/09 'file' folder is added. 9/12 forwarded mark. Default value of the mark strings are changed. + 12/24 Released 2.12.0 stable. @end example See @file{ChangeLog} for details. @@ -8944,8 +8959,7 @@ Each versions has code names (they are almost jokes). Currently they are picked up alphabetically from the top 40 hits of U.S. Billboard magazines in 1980s. -(@uref{http://lyrics.natalnet.com.br/html/top40/index.html}) - +(@uref{http://ntl.matrix.com.br/pfilho/html/top40/}) @node Index, , Addition, Top @unnumbered Index diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 50d2fe6..659aeaa 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2005-02-11 Hiroya Murata + + * elmo-multi.el (elmo-multi-folder-diff): Fixed problem when the + element of the difference is nil. + 2005-02-11 Yuuichi Teranishi * elmo-maildir.el (elmo-maildir-separator): Added some OS types diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index ccc899c..b4700b3 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -270,26 +270,24 @@ (elmo-multi-folder-diff folder)) (defun elmo-multi-folder-diff (folder) - (let ((flds (elmo-multi-folder-children-internal folder)) - (news 0) + (let ((news 0) (unreads 0) (alls 0) - no-unreads diff) - (while flds - (setq diff (elmo-folder-diff (car flds))) - (cond - ((consp (cdr diff)) ; (new unread all) - (setq news (+ news (nth 0 diff)) - unreads (+ unreads (nth 1 diff)) - alls (+ alls (nth 2 diff)))) - (t - (setq no-unreads t) - (setq news (+ news (car diff)) - alls (+ alls (cdr diff))))) - (setq flds (cdr flds))) - (if no-unreads - (cons news alls) - (list news unreads alls)))) + diff value) + (dolist (child (elmo-multi-folder-children-internal folder)) + (setq diff (elmo-folder-diff child)) + (setq news (and news + (setq value (elmo-diff-new diff)) + (+ news value)) + unreads (and unreads + (setq value (elmo-diff-unread diff)) + (+ unreads value)) + alls (and alls + (setq value (elmo-diff-all diff)) + (+ alls value)))) + (if unreads + (list news unreads alls) + (cons news alls)))) (luna-define-method elmo-folder-list-messages ((folder elmo-multi-folder) &optional visible-only in-msgdb) diff --git a/etc/VERSION b/etc/VERSION index 8f8dd23..b8b4036 100644 --- a/etc/VERSION +++ b/etc/VERSION @@ -130,5 +130,6 @@ 2.11.3 Wanted Dead Or Alive 2.12.0 Your Wildest Dreams +2.12.1 99 Luftballons -2.13.x? You Oughta Know +2.13.x You Oughta Know