From: okada Date: Fri, 27 Oct 2000 23:07:25 +0000 (+0000) Subject: fix capability X-Git-Tag: wl-2_4-root~57 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50c2500834c84586bf276722ed3e1866c0c4ef35;p=elisp%2Fwanderlust.git fix capability --- diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 4dd36b0..9dcc042 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -197,8 +197,8 @@ Wanderlust $B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k(B IMAP $B%5!<%P$O0J2<$NDL $B$j$G$9!#(B @itemize @bullet -@item UW imapd 4.1$B!A(B4.7, 4.7a, 4.7b, 4.7c -@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 +@item UW imapd 4.1$B!A(B4.7, 4.7a, 4.7b, 4.7c, 2000 $B0J9_(B +@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 $B0J9_(B @item AIR MAIL (AIRC imapd release 2.00) @item Express Mail @item Microsoft Exchange Server 5.5 diff --git a/doc/wl.texi b/doc/wl.texi index b60c79d..8c8423e 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -172,8 +172,8 @@ IMAP4 connectivity with following imapd are confirmed to work with Wanderlust: @itemize @bullet -@item UW imapd 4.1--4.7, 4.7a, 4.7b, 4.7c -@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 +@item UW imapd 4.1--4.7, 4.7a, 4.7b, 4.7c, 2000 or later +@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 or later @item AIR MAIL (AIRC imapd release 2.00) @item Express Mail @item Microsoft Exchange Server 5.5 diff --git a/elmo/ChangeLog b/elmo/ChangeLog index c513e62..102273a 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,10 @@ 2000-10-28 Kenichi OKADA + * elmo-imap4.el (elmo-network-initialize-session): Check capability. + * elmo-pop3.el (elmo-network-initialize-session): Ditto. + +2000-10-28 Kenichi OKADA + * elmo-imap4.el (elmo-network-initialize-session): Fix. 2000-10-28 Kenichi OKADA diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index f8567d7..d806b81 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1185,8 +1185,7 @@ If optional argument UNMARK is non-nil, unmark." (luna-define-method elmo-network-initialize-session ((session elmo-imap4-session)) - (let ((process (elmo-network-session-process-internal session)) - capability) + (let ((process (elmo-network-session-process-internal session))) (with-current-buffer (process-buffer process) ;; Skip garbage output from process before greeting. (while (and (memq (process-status process) '(open run)) @@ -1212,7 +1211,8 @@ If optional argument UNMARK is non-nil, unmark." (when (eq (elmo-network-stream-type-symbol (elmo-network-session-stream-type-internal session)) 'starttls) - (or (memq 'starttls capability) + (or (memq 'starttls + (elmo-imap4-session-capability-internal session)) (signal 'elmo-open-error '(elmo-imap4-starttls-error))) (elmo-imap4-send-command-wait session "starttls") diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index 892361a..87ead02 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -303,7 +303,7 @@ (luna-define-method elmo-network-initialize-session ((session elmo-pop3-session)) (let ((process (elmo-network-session-process-internal session)) - response capability mechanism) + response mechanism) (with-current-buffer (process-buffer process) (set-process-filter process 'elmo-pop3-process-filter) (setq elmo-pop3-read-point (point-min))