From 2d639866117fe4106f12dd099e90811fe478d7c2 Mon Sep 17 00:00:00 2001 From: teranisi Date: Thu, 21 Nov 2002 12:23:09 +0000 Subject: [PATCH] Synch up with main trunk. --- ChangeLog | 7 ++++++- INSTALL | 10 +++++----- INSTALL.ja | 10 +++++----- doc/wl-ja.texi | 18 ++++++++++-------- doc/wl.texi | 19 +++++++++++-------- elmo/ChangeLog | 24 ++++++++++++++++++++++++ elmo/elmo-imap4.el | 15 +++++++++++++-- elmo/elmo-multi.el | 5 +++-- elmo/elmo-nntp.el | 11 +++++++---- elmo/elmo-split.el | 6 ++++++ wl/ChangeLog | 16 ++++++++++++++++ wl/wl-folder.el | 12 ++++-------- 12 files changed, 110 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62e3708..bc02a3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-11-15 TAKAHASHI Kaoru + + * INSTALL, INSTALL.ja: Update Recommended combination of MIME + module package. + 2002-10-27 TAKAHASHI Kaoru * README, README.ja: Update stable branch. @@ -22,7 +27,7 @@ 2002-06-22 Yoichi NAKAYAMA - * WL-MK (wl-texinfo-format): Move condition for INFODIR into + * WL-MK (wl-texinfo-format): Move condition for INFODIR into wl-detect-info-directory. (wl-detect-info-directory): Check INFODIR after WL-CFG is loaded. diff --git a/INSTALL b/INSTALL index d370b7f..1e7a8f9 100644 --- a/INSTALL +++ b/INSTALL @@ -34,24 +34,24 @@ Select MIME Module (a) XEmacs 21.1 or later - APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.5 Installation as a XEmacs package, If possible. (b) Emacs 20.4 or later - APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.5 (c) Emacs 20.1 to 20.3 - APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.5 Use CLIME instead of FLIM. FLIM does not support Emacs 20.3 or earlier. (d) Emacs 19.34 (Mule 2.3) - APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.5 Mule based on Emacs 19.34 can also run SEMI. See the following web page to get more information (in Japanese). @@ -77,7 +77,7 @@ Install MIME Module latest versions should work. For example, the following combinations are confirmed to work: - APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 + APEL 10.4, SLIM 1.14.9, SEMI 1.14.5 APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 You have to re-install Wanderlust if you upgraded APEL, FLIM, or SEMI. diff --git a/INSTALL.ja b/INSTALL.ja index 4e5920b..8aa9e4e 100644 --- a/INSTALL.ja +++ b/INSTALL.ja @@ -33,23 +33,23 @@ MIME$BMQ%b%8%e!<%k$NA*Br(B (a) XEmacs 21.1 $B0J9_(B - APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.5 $B2DG=$J$i$P(B XEmacs $B$N%Q%C%1!<%8$H$7$F%$%s%9%H!<%k$9$k$3$H$r$*4+$a$7$^$9!#(B (b) Emacs 20.4 $B0J9_(B - APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 + APEL 10.4, FLIM 1.14.4, SEMI 1.14.5 (c) Emacs 20.1$B!A(B20.3 - APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.5 FLIM $B$,F0$-$^$;$s$N$G!"Be$o$j$K(B CLIME $B$r%$%s%9%H!<%k$7$F$/$@$5$$!#(B (d) Emacs 19.34 (Mule 2.3) - APEL 10.4, CLIME 1.14.5, SEMI 1.14.4 + APEL 10.4, CLIME 1.14.5, SEMI 1.14.5 Emacs 19.34 $B%Y!<%9$N(B Mule $B$G$O(B SEMI $B$rF0:n$5$;$k$3$H$,2DG=$G$9!#2<5-(B $B$N%Z!<%8$,;29M$K$J$j$^$9!#(B @@ -79,7 +79,7 @@ MIME$BMQ%b%8%e!<%k$N%$%s%9%H!<%k(B $BNc$($P!"0J2<$NAH9g$;$NF0:n$,3NG'$5$l$F$$$^$9!#(B - APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 + APEL 10.4, SLIM 1.14.9, SEMI 1.14.5 APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 APEL, FLIM, SEMI $B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"(BWanderlust $B$r%$%s%9(B diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 91a7298..355d7d6 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -279,7 +279,7 @@ APEL, FLIM, SEMI $B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(B $B?d>)$5$l$k(B APEL, FLIM, SEMI $B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#(B @itemize @minus -@item APEL 10.4, FLIM 1.14.4, SEMI 1.14.4 +@item APEL 10.4, FLIM 1.14.4, SEMI 1.14.5 @end itemize $B$=$NB>!"(BFLIM, SEMI $B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"(B @@ -288,7 +288,7 @@ APEL, FLIM, SEMI $B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#(B $BNc$($P!"0J2<$NAH9g$;$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#(B @itemize @minus -@item APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 +@item APEL 10.4, SLIM 1.14.9, SEMI 1.14.5 @item APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 @end itemize @@ -3067,8 +3067,8 @@ prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9! $B$?$@$7!"(BNNTP $B%U%)%k%@$G$+$D<+J,$,Ej9F$7$?%a%C%;!<%8$K8B$j$^$9!#(B (@code{wl-summary-reedit}) -@item M-e -@kindex M-e (Summary) +@item M-E +@kindex M-E (Summary) @findex wl-summary-resend-bounced-mail $B%+!<%=%k9T$N%a%C%;!<%8$,!"<+J,$N$H$3$m$KJV$C$F$-$?%(%i!<%a%C%;!<%8$J$i$P!"(B $B$b$&0l2sAw$k$?$a$N%I%i%U%H$rMQ0U$7$^$9!#(B @@ -5169,7 +5169,7 @@ plug $B>uBV$K$h$j(B 2$B9TL\$N(B @samp{(wl-plugged)} $B$,JQ2=$7$^$9!#(B @item elmo-enable-disconnected-operation @vindex elmo-enable-disconnected-operation -$B=i4|@_Dj$O(B @code{nil}$B!#(BIMAP4 $B$K4X$9$k%*%U%i%$%s=hM}$re$K(B BBDB $B$,$"$l$P!"(B @file{bbdb-wl.el} $B$O%P%$%H%3%s%Q%$%k(B/$B%$%s%9%H!<%k$5$l$^$9!#(B @@ -6602,7 +6603,8 @@ OK $B$G$9!#(B @subsection lsdb.el @pindex LSDB -$B0J2<$O!"@_Dj$N0lNc$G$9!#(B +The Lovely Sister Database (@uref{http://sourceforge.jp/projects/lsdb/}) +$B$r(B Wanderlust $B$H6&$K;H$&$?$a$N@_DjNc$r0J2<$K<($7$^$9!#(B @lisp @group diff --git a/doc/wl.texi b/doc/wl.texi index 70d57dc..7ecc95b 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -255,7 +255,7 @@ may help you.}. Recommended combination of APEL, FLIM and SEMI are following: @itemize @minus -@item APEL 10.4, FLIM 1.14.4 and SEMI 1.14.4 +@item APEL 10.4, FLIM 1.14.4 and SEMI 1.14.5 @end itemize You can also use many other FLIM/SEMI variants. Combination of the @@ -263,7 +263,7 @@ latest versions should work. For example, the following combination are confirmed to work. @itemize @minus -@item APEL 10.4, SLIM 1.14.9, SEMI 1.14.4 +@item APEL 10.4, SLIM 1.14.9, SEMI 1.14.5 @item APEL 10.4, CLIME 1.14.5, EMIKO 1.14.1 @end itemize @@ -3078,8 +3078,8 @@ If the message at current cursor point is your own netnews article, a draft for `supersedes message' for the message is prepared. (@code{wl-summary-reedit}) -@item M-e -@kindex M-e (Summary) +@item M-E +@kindex M-E (Summary) @findex wl-summary-resend-bounced-mail If the message at current cursor point is a bounced message, a draft for re-sending original message is prepared. @@ -5227,7 +5227,7 @@ manually, press @kbd{F} in the folder mode. @item elmo-enable-disconnected-operation @vindex elmo-enable-disconnected-operation -The initial setting is @code{nil}. Controls off-line operations +The initial setting is @code{t}. Controls off-line operations regarding IMAP4. If non-nil, off-line operations are carried out. @item elmo-lost+found-folder @@ -6665,8 +6665,9 @@ If @command{imput} is on the @code{exec-path} at the installation, @subsection bbdb.el @pindex BBDB -Place @file{util/bbdb-wl.el} on the @code{load-path} and do the following -settings. +To use The Insidious Big Brother Database (@uref{http://bbdb.sourceforge.net/}) +with Wanderlust, place @file{util/bbdb-wl.el} on the @code{load-path} +and do the following settings. If BBDB is on the @code{load-path} at the installation, @file{bbdb-wl.el} is byte-compiled and installed. @@ -6701,7 +6702,9 @@ in draft buffer. @subsection lsdb.el @pindex LSDB -The following is an example of settings: +The following is an example setting to use +The Lovely Sister Database (@uref{http://sourceforge.jp/projects/lsdb/}) +with Wanderlust. @lisp @group diff --git a/elmo/ChangeLog b/elmo/ChangeLog index a4fc939..4811601 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,9 +1,33 @@ +2002-11-21 Yuuichi Teranishi + + * elmo-nntp.el (elmo-nntp-search-primitive): Revert the last change. + + * elmo-multi.el (elmo-folder-search): Ignore errors while search. + + * elmo-imap4.el (elmo-imap4-response-garbage-p): New macro. + (elmo-imap4-read-response): Take care of garbage response. + +2002-11-20 Yoichi NAKAYAMA + + * elmo-nntp.el (elmo-nntp-search-primitive): Fix the last change, + just return nil instead of error. + +2002-11-19 Yoichi NAKAYAMA + + * elmo-nntp.el (elmo-nntp-search-primitive): Cause error when the + search-key is "body". + 2002-11-19 Yuuichi Teranishi * elmo-imap4.el (elmo-folder-list-subfolders): Check the return value of elmo-string-matched-assoc to use match-data. (Thanks to Mito ) +2002-11-17 Yoichi NAKAYAMA + + * elmo-split.el (elmo-split->): New function. + (elmo-split-<): Ditto. + 2002-11-14 Yuuichi Teranishi * elmo-msgdb.el (elmo-msgdb-get-message-id-from-buffer): Added diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index 81553d8..15df756 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -227,6 +227,10 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"") "Returns non-nil if RESPONSE is an 'BYE' response." (` (assq 'bye (, response)))) +(defmacro elmo-imap4-response-garbage-p (response) + "Returns non-nil if RESPONSE is an 'garbage' response." + (` (assq 'garbage (, response)))) + (defmacro elmo-imap4-response-value (response symbol) "Get value of the SYMBOL from RESPONSE." (` (nth 1 (assq (, symbol) (, response))))) @@ -241,7 +245,7 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"") matched)) (defmacro elmo-imap4-response-error-text (response) - "Returns text of NO, BAD, BYE response." + "Returns text of NO, BAD, BYE, response." (` (nth 1 (or (elmo-imap4-response-value (, response) 'no) (elmo-imap4-response-value (, response) 'bad) (elmo-imap4-response-value (, response) 'bye))))) @@ -347,7 +351,14 @@ TAG is the tag of the command" (with-current-buffer (process-buffer (elmo-network-session-process-internal session)) (while (not (or (string= tag elmo-imap4-reached-tag) - (elmo-imap4-response-bye-p elmo-imap4-current-response))) + (elmo-imap4-response-bye-p elmo-imap4-current-response) + (when (elmo-imap4-response-garbage-p + elmo-imap4-current-response) + (message "Garbage response: %s" + (elmo-imap4-response-value + elmo-imap4-current-response + 'garbage)) + t))) (when (memq (process-status (elmo-network-session-process-internal session)) '(open run)) diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index 5be1400..8199b2e 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -523,8 +523,9 @@ (+ (* (elmo-multi-folder-divide-number-internal folder) cur-number) x))) - (elmo-folder-search - (car flds) condition))))) + (ignore-errors + (elmo-folder-search + (car flds) condition)))))) (when numlist (setq numlist-list (cdr numlist-list))) (setq flds (cdr flds))) diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el index 9990cae..d705d60 100644 --- a/elmo/elmo-nntp.el +++ b/elmo/elmo-nntp.el @@ -302,10 +302,10 @@ Don't cache if nil.") (run-hooks 'elmo-nntp-opened-hook)) (defun elmo-nntp-process-filter (process output) - (save-excursion - (set-buffer (process-buffer process)) - (goto-char (point-max)) - (insert output))) + (when (buffer-live-p (process-buffer process)) + (with-current-buffer (process-buffer process) + (goto-char (point-max)) + (insert output)))) (defun elmo-nntp-send-mode-reader (session) (elmo-nntp-send-command session "mode reader") @@ -1142,6 +1142,9 @@ Returns a list of cons cells like (NUMBER . VALUE)" (if from-msgs (elmo-list-filter from-msgs result) result))) + ((string= "body" search-key) + (error +"Search by BODY is not supported (Toggle the plug off to search from caches)")) (t (let ((val (elmo-filter-value condition)) (negative (eq (elmo-filter-type condition) 'unmatch)) diff --git a/elmo/elmo-split.el b/elmo/elmo-split.el index 6dcd25d..d86e2c0 100644 --- a/elmo/elmo-split.el +++ b/elmo/elmo-split.el @@ -152,6 +152,12 @@ Example: (throw 'done nil))) t)) +(defun elmo-split-> (buffer size) + (> (buffer-size buffer) size)) + +(defun elmo-split-< (buffer size) + (< (buffer-size buffer) size)) + (defun elmo-split-address-equal (buffer field value) (with-current-buffer buffer (let ((addrs (mapcar diff --git a/wl/ChangeLog b/wl/ChangeLog index b16246b..61108ef 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,19 @@ +2002-11-20 Yoichi NAKAYAMA + + * wl-folder.el (wl-folder-get-prev-folder): Ignore nemacs. + (wl-folder-get-next-folder): Ditto. + (wl-folder-get-path): Ditto. + +2002-11-17 Yoichi NAKAYAMA + + * wl-mime.el (wl-message-verify-pgp-nonmime): With arg, ask coding + system and encode the region with it before verifying. + +2002-11-15 Yoichi NAKAYAMA + + * wl-mime.el (wl-message-verify-pgp-nonmime): Encode by the coding + system of the echo buffer before decoding. + 2002-11-14 Yoichi NAKAYAMA * wl-mime.el (wl-message-verify-pgp-nonmime): Verify sign in the diff --git a/wl/wl-folder.el b/wl/wl-folder.el index c0628af..e35d178 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -428,8 +428,7 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'." (setq entities (nth 2 entity))) ((stringp entity) (if (and (string= name entity) - ;; don't use eq, `id' is string on Nemacs. - (equal id (wl-folder-get-entity-id entity))) + (eq id (wl-folder-get-entity-id entity))) (throw 'done last-entity)) (if (or (not unread) (and (setq finfo (wl-folder-get-entity-info entity)) @@ -464,8 +463,7 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'." (> (+ (nth 0 finfo)(nth 1 finfo)) 0))) (throw 'done entity)) (if (and (string= name entity) - ;; don't use eq, `id' is string on Nemacs. - (equal id (wl-folder-get-entity-id entity))) + (eq id (wl-folder-get-entity-id entity))) (setq found t))))) (unless entities (setq entities (wl-pop entity-stack))))))) @@ -1934,8 +1932,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (cond ((consp entity) (if (and (or (not string) (string= string (car entity))) - ;; don't use eq, `id' is string on Nemacs. - (equal target-id (wl-folder-get-entity-id (car entity)))) + (eq target-id (wl-folder-get-entity-id (car entity)))) (throw 'done (wl-push target-id result-path)) (wl-push (wl-folder-get-entity-id (car entity)) result-path)) @@ -1943,8 +1940,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (setq entities (nth 2 entity))) ((stringp entity) (if (and (or (not string) (string= string entity)) - ;; don't use eq, `id' is string on Nemacs. - (equal target-id (wl-folder-get-entity-id entity))) + (eq target-id (wl-folder-get-entity-id entity))) (throw 'done (wl-push target-id result-path))))) (unless entities -- 1.7.10.4