From a7e016ea31e2cf25f2f41edaafbdd822865776dd Mon Sep 17 00:00:00 2001 From: teranisi Date: Thu, 1 Feb 2001 01:47:34 +0000 Subject: [PATCH] Sync up with 2.4.1. Version number is increased to 2.5.7. --- doc/wl-ja.texi | 9 +++++---- doc/wl.texi | 8 +++++--- elmo/ChangeLog | 14 ++++++++++++++ elmo/elmo-pop3.el | 18 ++++++++++-------- elmo/elmo-util.el | 8 ++++++-- elmo/elmo-version.el | 2 +- wl/ChangeLog | 26 ++++++++++++++++++++++++++ wl/wl-summary.el | 4 ++-- 8 files changed, 69 insertions(+), 20 deletions(-) diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 215d5c3..3ce5f45 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.6 +@set VERSION 2.5.7 @synindex pg cp @finalout @@ -77,7 +77,7 @@ into another language, under the above conditions for modified versions. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, +Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi}, @w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada}, and @w{Kaoru Takahashi}. @@ -766,8 +766,7 @@ RFC 2060 $B$G5,Dj$5$l$?(B IMAP4rev1 $B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$ @code{clear} ($B$^$?$O(B @code{nil}$B!#@8%Q%9%o!<%I$rAw?.(B) $B$N$$$:$l$+$r;XDj!#(B @end example -(CRAM-MD5 $B$d(B DIGEST-MD5 $B$K$h$kG'>Z$r9T$J$&$K$O(B $BK\%Q%C%1!<%8$N(B -@file{utils/sasl} $B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#(B) +(1.14.0 $B$h$j0JA0$N%P!<%8%g%s$N(B FLIM $B$G(B CRAM-MD5 $B$d(B DIGEST-MD5 $B$K$h$kG'>Z$r9T$J$&$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/sasl} $B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#(B1.14.0 $B0J9_$N%P!<%8%g%s$N(B FLIM $B$G$"$l$P!"K\%Q%C%1!<%8$N(B @file{utils/sasl} $B$r%$%s%9%H!<%k$9$kI,MW$O$"$j$^$;$s!#(B) default $BCM(B: @@ -6644,6 +6643,8 @@ Wanderlust $B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#(B 7/11 killed message $B5!G=DI2C!#(B 7/18 POP3 $B$r(B UIDL $BBP1~!#(B 9/12 biff $B5!G=(B with $B:72eED$5$s!u;32,$5$s!#(B + 10/17 expire-hide by $B2,ED$5$s!#(B + 11/08 2.4.0 stable $B%j%j!<%9!#(B @end example $B$/$o$7$$JQA+$O(B @file{ChangeLog} $B$r8fMw$/$@$5$$!#(B diff --git a/doc/wl.texi b/doc/wl.texi index 0227a9f..8597c97 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.6 +@set VERSION 2.5.7 @synindex pg cp @finalout @@ -61,7 +61,7 @@ into another language, under the above conditions for modified versions. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi}, +Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi}, @w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada}, @w{Kaoru Takahashi}, @w{Bun Mizuhara} and @w{Masayuki Osada}. @@ -739,7 +739,7 @@ You can specify @code{login} (encoded password transmission), @code{cram-md5} (CRAM-MD5 authentication), @code{digest-md5} (DIGEST-MD5 authentication) or @code{clear} (or @code{nil}, plain password transmission) as @var{authenticate-type}. (To use CRAM-MD5 or -DIGEST-MD5 authentication, you must install @file{utils/sasl} package.) +DIGEST-MD5 authentication, you must install @file{utils/sasl} package if FLIM version is earlier than 1.14.0. If FLIM version is 1.14.0 or later, you need not install @file{utils/sasl}) default: @@ -6703,6 +6703,8 @@ valuable advice and many pieces of code they contributed. 7/11 killed message feature. 7/18 Use UIDL in POP3. 9/12 biff feature with Satata-san & Yamaoka-san. + 10/17 expire-hide by Okada-san. + 11/08 Released 2.4.0 stable. @end example See @file{ChangeLog} for details. diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 3ced698..5111bdd 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,7 @@ +2001-02-01 Yuuichi Teranishi + + * elmo-version.el (elmo-version): Up to 2.5.7. + 2001-01-23 TAKAHASHI Kaoru * elmo-version.el (elmo-version): Up to 2.5.6. @@ -151,6 +155,16 @@ new SASL API. * elmo-imap4.el (elmo-network-authenticate-session): Ditto. +2001-01-30 Yuuichi Teranishi + + * elmo-util.el (elmo-folder-local-p): Treat pipe and filter. + +2001-01-19 Yuuichi Teranishi + + * elmo-pop3.el (elmo-pop3-sort-overview-by-original-number): + Fixed problem when `elmo-pop3-use-uidl' is nil. + (Reported by Takenobu Sugiyama ) + 2000-11-19 Kenichi OKADA * elmo-version.el (elmo-version): Up to 2.5.2. diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index 2a8edac..363345d 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -521,14 +521,16 @@ (defalias 'elmo-pop3-msgdb-create 'elmo-pop3-msgdb-create-as-numlist) (defun elmo-pop3-sort-overview-by-original-number (overview loc-alist) - (sort overview - (lambda (ent1 ent2) - (< (elmo-pop3-uidl-to-number - (cdr (assq (elmo-msgdb-overview-entity-get-number ent1) - loc-alist))) - (elmo-pop3-uidl-to-number - (cdr (assq (elmo-msgdb-overview-entity-get-number ent2) - loc-alist))))))) + (if loc-alist + (sort overview + (lambda (ent1 ent2) + (< (elmo-pop3-uidl-to-number + (cdr (assq (elmo-msgdb-overview-entity-get-number ent1) + loc-alist))) + (elmo-pop3-uidl-to-number + (cdr (assq (elmo-msgdb-overview-entity-get-number ent2) + loc-alist)))))) + overview)) (defun elmo-pop3-sort-msgdb-by-original-number (msgdb) (message "Sorting...") diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index de5eb0c..55fdc6a 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -1118,8 +1118,12 @@ Otherwise treat \\ in NEWTEXT string as special: (defun elmo-folder-local-p (folder) "Return whether FOLDER is a local folder or not." - (let ((type (elmo-folder-get-type folder))) - (memq type '(localdir localnews archive maildir internal cache)))) + (let ((spec (elmo-folder-get-spec folder))) + (case (car spec) + (filter (elmo-folder-local-p (nth 2 spec))) + (pipe (elmo-folder-local-p (elmo-pipe-spec-dst spec))) + (t (memq (car spec) + '(localdir localnews archive maildir internal cache)))))) (defun elmo-folder-writable-p (folder) (let ((type (elmo-folder-get-type folder))) diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el index ff64848..9c6e3ed 100644 --- a/elmo/elmo-version.el +++ b/elmo/elmo-version.el @@ -39,7 +39,7 @@ ;; product-define in the first place (product-provide 'elmo-version - (product-define "ELMO" nil '(2 5 6))) + (product-define "ELMO" nil '(2 5 7))) ;; For APEL 10.2 or earlier. (defun-maybe product-version-as-string (product) diff --git a/wl/ChangeLog b/wl/ChangeLog index 5c1d596..d281771 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,7 @@ +2001-02-01 Yuuichi Teranishi + + * Version number is increased to 2.5.7. + 2001-01-29 Katsumi Yamaoka * wl-message.el (wl-message-next-page): Bind @@ -56,6 +60,28 @@ * wl-draft.el (wl-draft-reply): Use `mime-find-field-decoder' to find decoder for To, Cc, and Subject. +2001-01-30 Yuuichi Teranishi + + * wl-summary.el (wl-cache-prefetch-next): Revert the logic + for checking `elmo-use-buffer-cache'. + (wl-summary-mark-as-important): Fixed typo in comment. + +2001-01-22 Yuuichi Teranishi + + * wl-draft.el (wl-draft-reply): Fixed problem when there's no subject + field in the original message. + (Pointed out by "HIROSE, Masaaki" ) + +2001-01-19 Akihiro MOTOKI + + * wl-expire.el (wl-expire-hide): + Call `wl-expire-delete-reserve-marked-msgs-from-list'. + +2001-01-19 Yuuichi Teranishi + + * wl-draft.el (wl-draft-reply): Use `mime-find-field-decoder' to + find decoder for To, Cc, and Subject. + 2001-01-18 Yuuichi Teranishi * Version number is increased to 2.5.5. diff --git a/wl/wl-summary.el b/wl/wl-summary.el index b27d743..9e31097 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -4302,7 +4302,7 @@ If ARG, exit virtual folder." (unless no-server-update (elmo-unmark-important folder (list number) msgdb) (elmo-msgdb-global-mark-delete message-id)) - ;; Remove cache if local it is folder. + ;; Remove cache if local folder. (if (elmo-folder-local-p folder) (elmo-cache-delete message-id folder number)) (when visible @@ -5981,7 +5981,7 @@ Use function list is `wl-summary-write-current-folder-functions'." (defun wl-cache-prefetch-next (fld msg &optional summary) (if (wl-cache-prefetch-p fld) - (if (not elmo-use-buffer-cache) + (if elmo-use-buffer-cache ;;; (message "`elmo-use-buffer-cache' is nil, cache prefetch is disable.") (save-excursion (set-buffer (or summary (get-buffer wl-summary-buffer-name))) -- 1.7.10.4