From: kaoru Date: Mon, 3 Sep 2001 16:23:56 +0000 (+0000) Subject: Apply patch [WL: 07938]. X-Git-Tag: wl-2_7_4~52 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8a3d7ced4d508dd266c8f9faa45ddf2a7dc72e5e;p=elisp%2Fwanderlust.git Apply patch [WL: 07938]. Thanks to Yoichi NAKAYAMA (Mail Addresses): Moved. (Address Book): New node for wl-addrmgr.el --- diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 92bf40b..c19a515 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -136,6 +136,7 @@ into another language, under the above conditions for modified versions. * Disconnected Operations:: $B%*%U%i%$%s=hM}(B * Expire and Archive:: $B%a%C%;!<%8$N<+F0:o=|$H%"!<%+%$%V(B * Scoring:: $B%a%C%;!<%8$N%9%3%"(B +* Address Book:: $B%"%I%l%9D"(B * Customization:: $B%+%9%?%^%$%:(B * Mailing List:: $B%a!<%j%s%0%j%9%H(B * Addition:: $B$*$^$1(B @@ -218,7 +219,6 @@ Wanderlust $B$r5/F0$9$k$^$G$KI,MW$Jl9g$O!"$3$N9`$OFI$_Ht$P$7$F$b9=$$(B -$B$^$;$s!#(B - -$B%"%I%l%9%U%!%$%k(B @file{~/.addresses} $B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#(B -@file{~/.addresses} $B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<(B -$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$J$*!"(B -$B5/F0$7$?>uBV$G%5%^%j%P%C%U%!$+$i(B @file{~/.addresses} $B$K%"%I%l%9$rDI2C(B/ -$BJQ99(B/$B:o=|$9$k$3$H$b2DG=$G$9!#(B - -$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#(B - -@example -@group -# -# @r{@samp{#} $B$G;O$^$k9T$O%3%a%s%H!#(B} -# @r{$B6u9T$OL5;k!#(B} -# -# @var{$B%a!<%k%"%I%l%9(B} "@var{$B$"$@L>(B}" "@var{$BK\L>(B}" -# -teranisi@@gohome.org "$B$F$i$K$7(B" "$B;{@>M50l(B" -foo@@bar.gohome.org "Foo $B$5$s(B" "John Foo" -bar@@foo.gohome.org "Bar $B$5$s(B" "Michael Bar" -@end group -@end example - -@noindent -$B0l9T$,0l?MJ,$NDj5A$G$9!#(B - -$B(B}$B!"%I%i%U%H:n@.;~$N%"(B -$B%I%l%9>pJs$H$7$F(B@var{$BK\L>(B}$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,(B -$B$o$+$j$d$9$$$H;W$o$l$^$9!#$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%"%I%l%9D"$N(B -$BDj5A$r$d$jD>$9$N$,NI$$$G$7$g$&!#(B - -$B$^$?!"JQ?t(B @code{wl-alias-file} $B$K(B MH $B$N(B alias file $B$,;XDj$5$l$F$$$l$P!"(B -$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#(B - -$B$5$i$K!"JQ?t(B @code{wl-use-ldap} ($B=i4|@_Dj$O(B @code{nil}) $B$r(B non-nil $B$K@_(B -$BDj$9$k$H!"(BLDAP $B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^(B -$B$9!#(B - -LDAP $B$rMxMQ$9$k>l9g$O!"(B@code{wl-ldap-server}$B!"(B@code{wl-ldap-port}, -@code{wl-ldap-base} $B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"(BLDAP $BBP1~$N(B XEmacs $B0J(B -$B30$G$O!"30It%W%m%0%i%`$H$7$F(B @command{ldapsearch} $B$rMxMQ$7$^$9$N$G!"(B -@command{ldapsearch} $B$X$"$i$+$8$a%3%^%s%IA0I=<(Ey$K$bMQ$$$i$l$^$9!#$J$*!"(B +$B5/F0$7$?>uBV$G%5%^%j%P%C%U%!$+$i(B @file{~/.addresses} $B$K%"%I%l%9$rDI2C(B/ +$BJQ99(B/$B:o=|$9$k$3$H$b2DG=$G$9!#(B + +$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#(B + +@example +@group +# +# @r{@samp{#} $B$G;O$^$k9T$O%3%a%s%H!#(B} +# @r{$B6u9T$OL5;k!#(B} +# +# @var{$B%a!<%k%"%I%l%9(B} "@var{$B$"$@L>(B}" "@var{$BK\L>(B}" +# +teranisi@@gohome.org "$B$F$i$K$7(B" "$B;{@>M50l(B" +foo@@bar.gohome.org "Foo $B$5$s(B" "John Foo" +bar@@foo.gohome.org "Bar $B$5$s(B" "Michael Bar" +@end group +@end example + +@noindent +$B0l9T$,0l?MJ,$NDj5A$G$9!#(B + +$B(B}$B!"%I%i%U%H:n@.;~$N%"(B +$B%I%l%9>pJs$H$7$F(B@var{$BK\L>(B}$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,(B +$B$o$+$j$d$9$$$H;W$o$l$^$9!#$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%"%I%l%9D"$N(B +$BDj5A$r$d$jD>$9$N$,NI$$$G$7$g$&!#(B + +$B$^$?!"JQ?t(B @code{wl-alias-file} $B$K(B MH $B$N(B alias file $B$,;XDj$5$l$F$$$l$P!"(B +$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#(B + +$B$5$i$K!"JQ?t(B @code{wl-use-ldap} ($B=i4|@_Dj$O(B @code{nil}) $B$r(B non-nil $B$K@_(B +$BDj$9$k$H!"(BLDAP $B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^(B +$B$9!#(B + +LDAP $B$rMxMQ$9$k>l9g$O!"(B@code{wl-ldap-server}$B!"(B@code{wl-ldap-port}, +@code{wl-ldap-base} $B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"(BLDAP $BBP1~$N(B XEmacs $B0J(B +$B30$G$O!"30It%W%m%0%i%`$H$7$F(B @command{ldapsearch} $B$rMxMQ$7$^$9$N$G!"(B +@command{ldapsearch} $B$X$"$i$+$8$a%3%^%s%IC$7$^$9!#(B + +@item x +@kindex x (Address Manager) +@findex wl-addrmgr-apply +$B08@h%^!<%/$,$D$$$F$$$k>l9g!"$=$l$i$N%"%I%l%9$r%I%i%U%H%P%C%U%!$K(B +$BH?1G$7$F%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#%I%i%U%H%P%C%U%!$,L5$$>l9g!"(B +$B$=$l$i$rH?1G$7$F?75,$K%I%i%U%H%P%C%U%!$r3+$-$^$9!#(B +$B08@h%^!<%/$,$D$$$F$$$J$$>l9g$OC1$K%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#(B + +@item q +@kindex q (Address Manager) +@findex wl-addrmgr-quit +$B%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#(B + +@item a +@kindex a (Address Manager) +@findex wl-addrmgr-add +$B%"%I%l%9D"$K?7$7$$9`L\$rDI2C$7$^$9!#(B + +@item d +@kindex d (Address Manager) +@findex wl-addrmgr-delete +$B%"%I%l%9D"$N9`L\$r:o=|$7$^$9!#(B + +@item e +@kindex e (Address Manager) +@findex wl-addrmgr-edit +$B%"%I%l%9D"$N9`L\$rJT=8$7$^$9!#(B +@end table + + +@node Customization, Mailing List, Address Book, Top @chapter Wanderlust $B$N%+%9%?%^%$%:(B @cindex Customization @@ -5945,7 +6014,7 @@ Emacs $B$GJT=8Cf$NAp9F%P%C%U%!$X(B dired $B$+$i%I%i%C%0(B&$B%I%m%C%W$9$k$@$ @end group @end lisp -@node MHC, , dired-dd, Living with other packages +@node MHC, , dired-dd, Living with other packages @subsection mhc.el @pindex MHC diff --git a/doc/wl.texi b/doc/wl.texi index 49025cf..f2ba0f2 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -111,6 +111,7 @@ This manual is for Wanderlust @value{VERSION}. * Disconnected Operations:: Off-Line management * Expire and Archive:: Automatic expiration and archiving of messages. * Scoring:: Score of the messages. +* Address Book:: Management Address Book. * Customization:: Customizing Wanderlust. * Mailing List:: Wanderlust mailing list * Addition:: Additional Information @@ -194,7 +195,6 @@ here. * Download:: Download and extract the packages. * Install:: Byte-compile and install. * Minimal Settings:: @file{.emacs} setup. -* Mail Addresses:: Address book definition. * Folder Definition:: Folder definition. * Start Wanderlust:: Starting Wanderlust @end menu @@ -459,7 +459,7 @@ You can read manual at the following URL: http://www.gohome.org/wl/doc/wl-euc_toc.html @end example -@node Minimal Settings, Mail Addresses, Install, Start Me Up +@node Minimal Settings, Folder Definition, Install, Start Me Up @section Set up .emacs @cindex Minimal Settings @cindex Settings @@ -545,61 +545,8 @@ It is effective only when your Emacs can define @code{mail-user-agent}. @end lisp -@node Mail Addresses, Folder Definition, Minimal Settings, Start Me Up -@section Address book -@cindex Address book Definition -@cindex .addresses -@cindex Alias, Address - -The file @file{~/.addresses} is a simple address book for Wanderlust. -Make address file @file{~/.addresses}, and edit to suit your requirement. - -The data written in @file{~/.addresses} are used for address completion -under draft editing mode. Furthermore, they are used when showing names -in summary display mode. You can safely skip this section, if you don't -want to customize address completion and summary display. -It is possible to add/change/remove addresses from @file{~/.addresses} in -summary buffer after Wanderlust is invoked. @refill -The format is very simple. Like this. @refill - -@example -@group -# -# @r{Lines begin with @samp{#} are comment.} -# @r{Empty lines are ignored} -# -# @r{Format of each line:} -# @var{email-address} "@var{nickname} "@var{realname}" -# -teranisi@@gohome.org "Yuuichi" "Yuuichi Teranishi" -foo@@bar.gohome.org "Mr. Foo" "John Foo" -bar@@foo.gohome.org "Mr. Bar" "Michael Bar" -@end group -@end example - -@noindent -One line defines one persons description. - -Actually, in default setup, @var{nickname} is used in summary-mode and -@var{realname} is used in draft preparation mode. This behavior is -better understood if you try it and confirmed the function first. You -can write and try a small definition, so you will know the idea of the -address book before writing a big one. - -And, if MH alias file is specified in variable @code{wl-alias-file}, -it is used as an address information in the draft preparation mode. - -If variable @code{wl-use-ldap} is non-nil (initial setting is -@code{nil}), address completion in draft mode uses LDAP information. - -If you use LDAP, you have to set @code{wl-ldap-server}, -@code{wl-ldap-port} and @code{wl-ldap-base} properly. If your emacs does -not have LDAP feature as built-in feature (Currently only XEmacs can -have built-in LDAP feature), you have to set command exec @env{PATH} to -the program @command{ldapsearch}. - -@node Folder Definition, Start Wanderlust, Mail Addresses, Start Me Up +@node Folder Definition, Start Wanderlust, Minimal Settings, Start Me Up @section Folder Definition @cindex Folder Definition @cindex .folders @@ -5313,7 +5260,7 @@ Needless to say, you can use your own function. @end table -@node Scoring, Customization, Expire and Archive, Top +@node Scoring, Address Book, Expire and Archive, Top @chapter Score of the Messages @cindex Scoring @c @cindex Kill File @@ -5811,7 +5758,137 @@ pop3 N E E E @end example -@node Customization, Mailing List, Scoring, Top +@node Address Book, Customization, Scoring, Top +@chapter Address Book +@cindex Address Book + +Address Book support mail address and petname display on summay +mode. + +@menu +* Mail Addresses:: Definition Address Book +* Address Manager:: Address Manager +@end menu + +@node Mail Addresses, Address Manager, Address Book, Address Book +@section Address book +@cindex Address book Definition +@cindex .addresses +@cindex Alias, Address + +The file @file{~/.addresses} is a simple address book for Wanderlust. +Make address file @file{~/.addresses}, and edit to suit your requirement. + +The data written in @file{~/.addresses} are used for address completion +under draft editing mode. Furthermore, they are used when showing names +in summary display mode. You can safely skip this section, if you don't +want to customize address completion and summary display. +It is possible to add/change/remove addresses from @file{~/.addresses} in +summary buffer after Wanderlust is invoked. @refill + +The format is very simple. Like this. @refill + +@example +@group +# +# @r{Lines begin with @samp{#} are comment.} +# @r{Empty lines are ignored} +# +# @r{Format of each line:} +# @var{email-address} "@var{nickname} "@var{realname}" +# +teranisi@@gohome.org "Yuuichi" "Yuuichi Teranishi" +foo@@bar.gohome.org "Mr. Foo" "John Foo" +bar@@foo.gohome.org "Mr. Bar" "Michael Bar" +@end group +@end example + +@noindent +One line defines one persons description. + +Actually, in default setup, @var{nickname} is used in summary-mode and +@var{realname} is used in draft preparation mode. This behavior is +better understood if you try it and confirmed the function first. You +can write and try a small definition, so you will know the idea of the +address book before writing a big one. + +And, if MH alias file is specified in variable @code{wl-alias-file}, +it is used as an address information in the draft preparation mode. + +If variable @code{wl-use-ldap} is non-nil (initial setting is +@code{nil}), address completion in draft mode uses LDAP information. + +If you use LDAP, you have to set @code{wl-ldap-server}, +@code{wl-ldap-port} and @code{wl-ldap-base} properly. If your emacs does +not have LDAP feature as built-in feature (Currently only XEmacs can +have built-in LDAP feature), you have to set command exec @env{PATH} to +the program @command{ldapsearch}. + + +@node Address Manager, , Mail Addresses, Address Book +@section Address Manager +@cindex Address Manager + +You can type @kbd{C-c C-a} to enter address manger mode. you can edit +the address book and insert address to draft buffer. + +@subsection Key Bindings + +@table @kbd +@item t +@kindex t (Address Manager) +@findex wl-addrmgr-set-to +Add @samp{To:} mark. + +@item c +@kindex c (Address Manager) +@findex wl-addrmgr-set-cc +Add @samp{Cc:} mark + +@item b +@kindex b (Address Manager) +@findex wl-addrmgr-set-bcc +Add @samp{Bcc:} mark. + +@item u +@kindex u (Address Manager) +@findex wl-addrmgr-unmark +Cancel the mark. + +@item x +@kindex x (Address Manager) +@findex wl-addrmgr-apply + +Insert @samp{To:}, @samp{Cc:}, or @samp{Bcc:} marked addresses to draft +buffer and quit address manager. When no draft buffer, make new draft +with insert marked addresses. + +If no mark, quit address manager. + + +@item q +@kindex q (Address Manager) +@findex wl-addrmgr-quit +Quit address manager. + +@item a +@kindex a (Address Manager) +@findex wl-addrmgr-add +Add new entry. + +@item d +@kindex d (Address Manager) +@findex wl-addrmgr-delete +Delete entry. + +@item e +@kindex e (Address Manager) +@findex wl-addrmgr-edit +Edit entry. +@end table + + +@node Customization, Mailing List, Address Book, Top @chapter Customizing Wanderlust @cindex Customization @@ -6009,7 +6086,7 @@ specific, but general-purpose for tm/SEMI). @end group @end lisp -@node MHC, , dired-dd, Living with other packages +@node MHC, , dired-dd, Living with other packages @subsection mhc.el @pindex MHC