From df72feaf687391d9dad132c8253f99a1e02e7700 Mon Sep 17 00:00:00 2001 From: kaoru Date: Tue, 23 Jan 2001 11:59:35 +0000 Subject: [PATCH] Sync with wl-2_4. --- doc/wl-ja.texi | 22 ++++++++++++++-------- doc/wl.texi | 18 +++++++++++------- samples/en/dot.wl | 33 +++++++++++++++------------------ samples/ja/dot.wl | 33 +++++++++++++++------------------ 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 2cced6b..215d5c3 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.5 +@set VERSION 2.5.6 @synindex pg cp @finalout @@ -22,7 +22,7 @@ Yet another message interface on Emacsen. $B$3$N%U%!%$%k$O(B Emacs $B$GF0$/%a!<%k(B/$B%K%e!<%94IM}%7%9%F%`(B Wanderlust $B$K4X$9(B $B$k@bL@=q$G$9!#(B -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}. @@ -763,7 +763,7 @@ RFC 2060 $B$G5,Dj$5$l$?(B IMAP4rev1 $B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$ @var{$BG'>ZK!(B}$B$K$O(B @code{login} ($B%(%s%3!<%I$7$F%Q%9%o!<%I$rAw?.(B)$B$+(B @code{cram-md5} (CRAM-MD5 $B$K$h$kG'>Z(B)$B$+(B @code{digest-md5} (DIGEST-MD5 $B$K$h$kG'>Z(B)$B$+(B - @code{plain} ($B$^$?$O(B @code{nil}$B!#@8%Q%9%o!<%I$rAw?.(B) $B$N$$$:$l$+$r;XDj!#(B + @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 @@ -802,8 +802,8 @@ non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttl $BG'>ZK!$H$7$F!"(B@code{login}$B!"(B@code{cram-md5} $B$b$7$/$O(B @code{digest-md5} $B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,(B $B%Q%9%o!<%I$r%(%s%3!<%I$7$Fl9g$O!"3NG'$N$N$A!"(B -@code{plain} ($B@8%Q%9%o!<%I$rAw$k(B) $B$K@ZBX$($^$9!#JQ?t(B -@code{elmo-imap4-force-login} $B$,(B non-nil $B$J$i$P!"3NG'L5$7$K(B @code{plain} +@code{clear} ($B@8%Q%9%o!<%I$rAw$k(B) $B$K@ZBX$($^$9!#JQ?t(B +@code{elmo-imap4-force-login} $B$,(B non-nil $B$J$i$P!"3NG'L5$7$K(B @code{clear} $B$K@ZBX$($^$9(B($B=i4|@_Dj$O(B @code{nil})$B!#(B $BNc(B: @@ -814,9 +814,9 @@ non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttl %#mh/inbox -> IMAP $B$N%a!<%k%\%C%/%9!"(B"#mh/inbox" %inbox:hoge -> IMAP $B$N%a!<%k%\%C%/%9!"(B"inbox" $B$X%f!<%6(B "hoge" $B$G%"%/%;%9!#(B -%inbox:hoge/plain@@server1 +%inbox:hoge/clear@@server1 -> server1 $B>e$N(B IMAP $B$N%a!<%k%\%C%/%9(B "inbox" $B$X(B - $B%f!<%6(B "hoge" $B$G!"@8%Q%9%o!<%I$rAw$C$F(B('plain $B$G(B) + $B%f!<%6(B "hoge" $B$G!"@8%Q%9%o!<%I$rAw$C$F(B('clear $B$G(B) $B%"%/%;%9!#(B @end group @end example @@ -2472,7 +2472,13 @@ MH Folder, News Spool Folder, Maildir Folder $B$N$_$G$9!#(B $B$b$&0l2s(B @kbd{/} $B$r2!$9$H!"%9%l%C%I$rJD$8$^$9!#(B prefix argument $B$D$-$G(B @kbd{/} $B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#(B -@kbd{t} $B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#(B +@kbd{[} $B$G%5%^%j$NA4$F$N%9%l%C%I$r3+$-!"(B@kbd{]}$B$GA4$F$N%9%l%C%I$rJD$8$^(B +$B$9!#(B + +@kbd{t} $B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g(B +$B$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#(B +@xref{Key Bindings of Summary}. + @subsection $B%9%l%C%I$N7R$.$J$*$7(B diff --git a/doc/wl.texi b/doc/wl.texi index eefa605..0227a9f 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.5 +@set VERSION 2.5.6 @synindex pg cp @finalout @@ -19,7 +19,7 @@ This file documents Wanderlust, Yet another message interface on Emacsen. -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}. @@ -737,7 +737,7 @@ Format: You can specify @code{login} (encoded password transmission), @code{cram-md5} (CRAM-MD5 authentication), @code{digest-md5} (DIGEST-MD5 -authentication) or @code{plain} (or @code{nil}, plain password +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.) @@ -771,9 +771,9 @@ 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 your server is unable to receive an encoded password, authentication -will fall back to @code{plain} (that is, sending password in raw format) +will fall back to @code{clear} (that is, sending password in raw format) after confirmation to user. If @code{elmo-imap4-force-login} is non-nil, -authentication will fall back to @code{plain} without confirmation +authentication will fall back to @code{clear} without confirmation (default value is @code{nil}). Example: @@ -784,10 +784,10 @@ Example: %#mh/inbox -> IMAP mailbox "#mh/inbox" %inbox:hoge -> IMAP mailbox "inbox" of user "hoge". -%inbox:hoge/login@@server1 +%inbox:hoge/clear@@server1 -> server1's IMAP mailbox "inbox" of user "hoge", with plain password authentication - ('plain). + ('clear). @end group @end example @@ -2457,8 +2457,12 @@ the appearance like following. If you type @kbd{/} key once again, the thread is closed. With prefix argument, @kbd{/} opens all children threads. +If you type @kbd{[}, opens all threads in summary. @kbd{]} closes all +threads. + Commands with the key binding that begins with @kbd{t} executes commands on the messages in the thread. +@xref{Key Bindings of Summary}. @subsection reconstruct thread by hand diff --git a/samples/en/dot.wl b/samples/en/dot.wl index 30f3a6d..7d17130 100644 --- a/samples/en/dot.wl +++ b/samples/en/dot.wl @@ -12,14 +12,17 @@ ;;; [[ Private Setting ]] ;; Header From -;(setq wl-from "Your Name ") +;(setq wl-from "Your Name ") ;; Organization ;(setq wl-organization "") -;;; [[ Basic Setting ]] +;; User's mail addresses. +(setq wl-user-mail-address-list + (list (wl-address-header-extract-address wl-from) + ;;"e-mail2@example.com" ... + )) -;; A directory for message database. -(setq elmo-msgdb-dir "~/.elmo") +;;; [[ Basic Setting ]] ;; Home directory for MH (localdir) (setq elmo-localdir-folder-path "~/Mail") @@ -201,6 +204,13 @@ ;;; [[ Special Setting ]] +;; Subscribed mailing list. +(setq wl-subscribed-mailing-list + '("wl@lists.airs.net" + "apel-ja@m17n.org" + ;;"ml@example.com" ... + )) + ;; compress ~/elmo using jka-compr. ;(setq elmo-msgdb-overview-filename "overview.gz") ;(setq elmo-msgdb-number-filename "number.gz") @@ -214,19 +224,6 @@ (wl-folder-open-unread-folder entity) )) -;; User's mail addresses. -(setq wl-user-mail-address-list - (list (wl-address-header-extract-address wl-from) - ;;"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). @@ -285,7 +282,7 @@ ("Organization" . "~/.wl sample") (body . "Hello, this is XXX \n")) ;; body ("report" - ("To" . "boss@company.jp") + ("To" . "boss@example.com") ("Subject" . "Report") (top . "Sir, here is my report\n") ;; insert in top. ;; (bottom-file . "~/work/report.txt") ;; insert file in bottom diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl index a9d2a49..3eb338c 100644 --- a/samples/ja/dot.wl +++ b/samples/ja/dot.wl @@ -12,14 +12,17 @@ ;;; [[ $B8D?M>pJs$N@_Dj(B ]] ;; From $B$N@_Dj(B -;(setq wl-from "Your Name ") +;(setq wl-from "Your Name ") ;; Organization $B$N@_Dj(B ;(setq wl-organization "") -;;; [[ $B4pK\E*$J@_Dj(B ]] +;; $B<+J,$N%a!<%k%"%I%l%9$N%j%9%H(B +(setq wl-user-mail-address-list + (list (wl-address-header-extract-address wl-from) + ;;"e-mail2@example.com" ... + )) -;; $B%a%C%;!<%8%G!<%?%Y!<%9$r:n$k%G%#%l%/%H%j(B -(setq elmo-msgdb-dir "~/.elmo") +;;; [[ $B4pK\E*$J@_Dj(B ]] ;; MH (localdir) $B$N%[!<%`(B (setq elmo-localdir-folder-path "~/Mail") @@ -202,6 +205,13 @@ ;;; [[ $BFCpJs$r;}$D%U%#!<%k%I$r(Boverview$B>pJs$K(B @@ -288,7 +285,7 @@ ("Organization" . "~/.wl sample") (body . " $B!{!{$G$9!#(B\n")) ;; $BK\J8(B ("report" - ("To" . "boss@company.jp") + ("To" . "boss@example.com") ("Subject" . "$BJs9p(B") (top . "$B:#=5$NJs9p$G$9!#(B\n") ;; $BK\J8@hF,$X$NA^F~(B ;; (bottom-file . "~/work/report.txt") ;; $BK\J8KvHx$X%U%!%$%k$NA^F~(B -- 1.7.10.4