Change bahavior of wl-summary-width and wl-summary-indent-length-limit.
[elisp/wanderlust.git] / doc / wl-ja.texi
index 5b3bb9c..d2a2cbf 100644 (file)
@@ -24,7 +24,8 @@ Yet another message interface on Emacsen.
 
 Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
 @w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@w{Kenichi Okada} and @w{Kaoru Takahashi}.
+@w{Kenichi Okada}, @w{Kaoru Takahashi}, @w{Katsumi Yamaoka},
+@w{Hiroya Murata} and @w{Yoichi Nakayama}.
 
 This edition is for Wanderlust version @value{VERSION}.
 
@@ -74,12 +75,16 @@ into another language, under the above conditions for modified versions.
 @author \e$BB<EDA442\e(B
 @author \e$B2,ED7r0l\e(B
 @author \e$B9b66\e(B  \e$B0j\e(B
+@author \e$B;32,9nH~\e(B
+@author \e$BB<ED9@Li\e(B
+@author \e$BCf;3MN0l\e(B
 @page
 
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
-@w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada}, and
-@w{Kaoru Takahashi}.
+@w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada},
+@w{Kaoru Takahashi}, @w{Katsumi Yamaoka}, @w{Hiroya Murata} and 
+@w{Yoichi Nakayama}.
 
 This manual is for Wanderlust version @value{VERSION}.
 
@@ -119,6 +124,9 @@ into another language, under the above conditions for modified versions.
 \e$BB<EDA442\e(B
 \e$B2,ED7r0l\e(B
 \e$B9b66\e(B  \e$B0j\e(B
+\e$B;32,9nH~\e(B
+\e$BB<ED9@Li\e(B
+\e$BCf;3MN0l\e(B
 @end flushright
 
 \e$B$3$NJ8=q$O\e(B Wanderlust @value{VERSION} \e$B$KBP1~$7$^$9!#\e(B
@@ -136,6 +144,7 @@ into another language, under the above conditions for modified versions.
 * Disconnected Operations::  \e$B%*%U%i%$%s=hM}\e(B
 * Expire and Archive::       \e$B%a%C%;!<%8$N<+F0:o=|$H%"!<%+%$%V\e(B
 * Scoring::                  \e$B%a%C%;!<%8$N%9%3%"\e(B
+* Address Book::             \e$B%"%I%l%9D"\e(B
 * Customization::            \e$B%+%9%?%^%$%:\e(B
 * Mailing List::             \e$B%a!<%j%s%0%j%9%H\e(B
 * Addition::                 \e$B$*$^$1\e(B
@@ -162,7 +171,7 @@ Wanderlust \e$B$N<g$JFCD'\e(B/\e$BFCD9$O0J2<$NDL$j$G$9!#\e(B
 @item \e$B9XFI%U%)%k%@$N0lMw$rI=<($9$k%U%)%k%@%b!<%I!#\e(B
 @item \e$B%a%C%;!<%8%-%c%C%7%e!"\e(BDisconnected Operation (\e$B8=:_$OI=<($N$_\e(B)\e$B!#\e(B
 @item MH \e$BE*\e(B FCC\e$B!#\e(B(@samp{FCC: %Backup} \e$B$d\e(B @samp{FCC: $Backup} \e$B$b2D\e(B)\e$B!#\e(B
-@item MIME \e$BBP1~\e(B (by SEMI or tm)\e$B!#\e(B
+@item MIME \e$BBP1~\e(B (by SEMI)\e$B!#\e(B
 @item \e$B%K%e!<%9\e(B/\e$B%a!<%k$NAw?.$rE}9g$7$?%a%C%;!<%8Aw?.%I%i%U%H!#\e(B
 @item \e$B%U%)%k%@0lMw$N%"%$%3%sI=<(\e(B (XEmacs \e$B$H\e(B Emacs 21)\e$B!#\e(B
 @item \e$BBg$-$J%Q!<%H$r<h$j4s$;$:$KI=<(\e(B(IMAP4)\e$B!#\e(B
@@ -178,17 +187,12 @@ Wanderlust \e$B$N<g$JFCD'\e(B/\e$BFCD9$O0J2<$NDL$j$G$9!#\e(B
 @section \e$BF0:n4D6-\e(B
 
 Wanderlust \e$B$O0J2<$N\e(B Emacsen \e$B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#\e(B
-@c \e$B$5$i$K\e(B Nemacs 3.3.2 \e$B>e$G$b!"\e(B(\e$B;H$($k5!G=$O8BDj$5$l$k$b$N$N\e(B) \e$BF0:n$9$k$3$H\e(B
-@c \e$B$,3NG'$5$l$F$$$^$9!#\e(B
 
 @itemize @bullet
-@item Nemacs 3.3.2 (\e$BCm\e(B: \e$B;H$($k5!G=$O8BDj$5$l$^$9\e(B)
-@item Mule 2.3 based on Emacs 19.28
 @item Mule 2.3 based on Emacs 19.34
 @item Emacs 20.2 \e$B0J9_\e(B
 @item XEmacs 20.4 \e$B0J9_\e(B
 @item Meadow 1.00 \e$B0J9_\e(B
-@item Mule for Windows v1.22
 @item NTEmacs 20.4 \e$B0J9_\e(B
 @item PMMule
 @end itemize
@@ -198,15 +202,20 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 
 @itemize @bullet
 @item UW imapd 4.1\e$B!A\e(B4.7, 4.7a, 4.7b, 4.7c, 2000 \e$B0J9_\e(B
-@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 \e$B0J9_\e(B
+@item Cyrus imapd 1.4, 1.5.19, 1.6.22\e$B!A\e(B1.6.24, 2.0.5 \e$B0J9_\e(B
+@item Courier-IMAP 1.3.2 \e$B0J9_\e(B
 @item AIR MAIL (AIRC imapd release 2.00)
 @item Express Mail
 @item Microsoft Exchange Server 5.5
-@item Sun Internet Mail Server 4.0
+@item Sun Internet Mail Server 3.5, 3.5.alpha, 4.0
 @end itemize
 
-@c Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B LDAP \e$B%5!<%P$O0J2<$NDL\e(B
-@c \e$B$j$G$9!#\e(B
+Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B LDAP \e$B%5!<%P$O0J2<$NDL\e(B
+\e$B$j$G$9!#\e(B
+
+@itemize @bullet
+@item OpenLDAP 2.0.6 \e$B0J9_\e(B
+@end itemize
 
 
 @node Start Me Up, Folders, Introduction, Top
@@ -215,14 +224,14 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 
 Wanderlust \e$B$r5/F0$9$k$^$G$KI,MW$J<j=g$r=gHV$K@bL@$7$^$9!#\e(B
 
-(\e$BEvA3$N$3$H$J$,$i!"$3$l$i$h$j$b@h$K!"%a!<%k\e(B/\e$B%K%e!<%9$rFI$`$3$H$N$G$-$k4D6-$,$"$i$+$8$aI,MW$G$9!#\e(B)
+(\e$BEvA3$N$3$H$J$,$i!"$3$l$i$h$j$b@h$K!"%a!<%k\e(B/\e$B%K%e!<%9$rFI$`$3$H$N$G$-$k4D\e(B
+\e$B6-$,$"$i$+$8$aI,MW$G$9!#\e(B)
 
 @menu
 * MIME Modules::      MIME \e$BMQ%b%8%e!<%k$N%$%s%9%H!<%k\e(B
 * Download::          \e$B%Q%C%1!<%8$NF~<j$HE83+\e(B
 * Install::           \e$B%P%$%H%3%s%Q%$%k$H%$%s%9%H!<%k\e(B
 * Minimal Settings::  @file{.emacs} \e$B$N@_Dj\e(B
-* Mail Addresses::    \e$B%"%I%l%9D"$NDj5A\e(B
 * Folder Definition:: \e$B9XFI$9$k%U%)%k%@$NDj5A\e(B
 * Start Wanderlust::  Wanderlust \e$B$N5/F0\e(B
 @end menu
@@ -234,29 +243,15 @@ Wanderlust \e$B$r5/F0$9$k$^$G$KI,MW$J<j=g$r=gHV$K@bL@$7$^$9!#\e(B
 @pindex APEL
 @pindex FLIM
 @pindex SEMI
-@pindex tm
-
-Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$b$7$/$O\e(B tm \e$B$,%$%s%9\e(B
-\e$B%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
 
-Emacs19.28 \e$B0JA0$r%Y!<%9$H$7$?\e(B Mule \e$B$r$*;H$$$N>l9g$O\e(B SEMI \e$B$,F0$+$J$$$O$:\e(B
-@footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$G$O\e(B SEMI \e$B$rF0:n$5$;$k$3$H$b2DG=$G$9!#\e(B@*
-@uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J$j$^$9!#\e(B}
-\e$B$J$N$G\e(B tm \e$B$r%$%s%9%H!<%k$7$^$9!#\e(B
-(tm \e$B$O%P!<%8%g%s\e(B 8.7 \e$B0J9_$r$4MxMQ$/$@$5$$!#\e(B)
-
-SEMI \e$B$,;H$($k\e(B Emacsen \e$B$G$O!"\e(Btm \e$B$h$j$b5!G=$N=<<B$7$?\e(B SEMI \e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$k$3$H$r$*4+$a$7$^$9!#\e(B
-
-\e$B%$%s%9%H!<%k$NJ}K!$O3F%Q%C%1!<%8$KE:IU$5$l$F$$$k%I%-%e%a%s%H$r;2>H$7$F\e(B
-\e$B$/$@$5$$!#\e(B
+Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$,%$%s%9%H!<%k$5$l$F$$$k\e(B
+\e$BI,MW$,$"$j$^$9!#\e(B
 
-SEMI, tm \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
+SEMI \e$B$O0J2<$N>l=j$+$i%@%&%s%m!<%I$G$-$^$9!#\e(B
 
 @example
 @group
 SEMI:   ftp://ftp.m17n.org/pub/mule/semi/
-tm:     http://cvs.m17n.org/tomo/comp/emacsen/tm/tm-8/
 @end group
 @end example
 
@@ -274,10 +269,16 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 \e$B4pK\E*$K$9$Y$F\e(B @samp{make install} \e$B$N<B9T$G:Q$`$O$:$G$9\e(B
 (XEmacs 21 \e$B$G$O\e(B @samp{make install-package})\e$B!#\e(B
 
+\e$B%$%s%9%H!<%k$NJ}K!$N>\:Y$K$D$$$F$O!"3F%Q%C%1!<%8$KE:IU$5$l$F$$$k%I%-%e%a\e(B
+\e$B%s%H$r;2>H$7$F$/$@$5$$\e(B @footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$r;H$C$F$$$k\e(B
+\e$B>l9g!"\e(B@* @uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J\e(B
+\e$B$k$+$b$7$l$^$;$s!#\e(B}\e$B!#\e(B
+
+
 \e$B?d>)$5$l$k\e(B APEL, FLIM, SEMI \e$B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#\e(B
 
 @itemize @minus
-@item APEL 10.3, FLIM 1.14.2, SEMI 1.14.3
+@item APEL 10.3, FLIM 1.14.3, SEMI 1.14.3
 @end itemize
 
 \e$B$=$NB>!"\e(BFLIM, SEMI \e$B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"\e(B
@@ -290,8 +291,8 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 @item APEL 10.2, SLIM 1.14.3, EMY 1.13.9
 @end itemize
 
-APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r%$\e(B
-\e$B%s%9%H!<%k$7D>$7$F$/$@$5$$!#\e(B
+APEL, FLIM \e$B$b$7$/$O\e(B SEMI \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r\e(B
+\e$B%$%s%9%H!<%k$7D>$7$F$/$@$5$$!#\e(B
 
 
 @node Download, Install, MIME Modules, Start Me Up
@@ -421,7 +422,7 @@ ELMO \e$B%b%8%e!<%k$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j$r;XDj$7$^$9!#\e(B
 ELMO \e$B%b%8%e!<%k$K$O%U%!%$%k\e(B @file{elmo*.el} @file{elmo*.elc} \e$B$,4^$^$l$^$9!#\e(B
 @c  @file{utf7.el}, @file{utf7.elc} \e$B$b\e(B ELMO \e$B%b%8%e!<%k$K4^$^$l$^$9!#\e(B
 @end table
-  
+
 @noindent
 @code{WL_PREFIX}, @code{ELMO_PREFIX}
  \e$B$N%G%U%)%k%H$O$$$:$l$b\e(B @file{wl} \e$B$G$9!#\e(B
@@ -496,7 +497,7 @@ 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 @file{.emacs}, @file{.wl} \e$B$N@_Dj\e(B
 @cindex Minimal Settings
 @cindex Settings
@@ -520,8 +521,8 @@ Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 
 @lisp
 @group
-;; @r{SEMI/tm \e$B$r;H$&$?$a$N@_Dj\e(B}
-(load "mime-setup")
+;; @r{SEMI \e$B$r;H$&$?$a$N@_Dj\e(B}
+(require 'mime-setup)
 
 ;; @r{autoload \e$B$N@_Dj\e(B}
 ;; @r{(XEmacs \e$B$N\e(B package \e$B$H$7$F%$%s%9%H!<%k$5$l$F$$$k>l9g!"I,MW$"$j$^$;$s\e(B)}
@@ -544,7 +545,7 @@ Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 \e$B$&!#\e(Bface \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B@file{~/.wl} 
 \e$B$K=q$$$F$/$@$5$$!#\e(B@xref{Highlights}.
 
-\e$B>e5-$N$&$A!"\e(B@samp{(load "mime-setup")} \e$B$H\e(B @code{autoload} \e$B$N@_Dj$O\e(B
+\e$B>e5-$N$&$A!"\e(B@samp{(require 'mime-setup)} \e$B$H\e(B @code{autoload} \e$B$N@_Dj$O\e(B
 @file{~/.emacs} \e$B$K=q$/I,MW$,$"$j$^$9!#$=$l0J30$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-\e(B
 \e$B=R$G$-$^$9!#\e(B
 
@@ -576,60 +577,7 @@ Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7
 @end group
 @end lisp
 
-
-@node Mail Addresses, Folder Definition, Minimal Settings, Start Me Up
-@section \e$B%"%I%l%9D"$NDj5A\e(B
-@cindex Address book Definition
-@cindex .addresses
-@cindex Alias, Address
-
-\e$B%"%I%l%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OFI$_Ht$P$7$F$b9=$$\e(B
-\e$B$^$;$s!#\e(B
-
-\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
-@file{~/.addresses} \e$B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<\e(B
-\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$J$*!"\e(B
-\e$B5/F0$7$?>uBV$G%5%^%j%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9$rDI2C\e(B/
-\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
-
-\e$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#\e(B
-
-@example
-@group
-#
-# @r{@samp{#} \e$B$G;O$^$k9T$O%3%a%s%H!#\e(B}
-# @r{\e$B6u9T$OL5;k!#\e(B}
-#
-# @var{\e$B%a!<%k%"%I%l%9\e(B}  "@var{\e$B$"$@L>\e(B}"  "@var{\e$BK\L>\e(B}"
-#
-teranisi@@gohome.org            "\e$B$F$i$K$7\e(B"      "\e$B;{@>M50l\e(B"
-foo@@bar.gohome.org             "Foo \e$B$5$s\e(B"      "John Foo"
-bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
-@end group
-@end example
-
-@noindent
-\e$B0l9T$,0l?MJ,$NDj5A$G$9!#\e(B
-
-\e$B<B:]$K$O\e(B(\e$B%G%U%)%k%H@_Dj$G$O\e(B)\e$B%5%^%jI=<($G\e(B@var{\e$B$"$@L>\e(B}\e$B!"%I%i%U%H:n@.;~$N%"\e(B
-\e$B%I%l%9>pJs$H$7$F\e(B@var{\e$BK\L>\e(B}\e$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,\e(B
-\e$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\e(B
-\e$BDj5A$r$d$jD>$9$N$,NI$$$G$7$g$&!#\e(B
-
-\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F$$$l$P!"\e(B
-\e$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
-
-\e$B$5$i$K!"JQ?t\e(B @code{wl-use-ldap} (\e$B=i4|@_Dj$O\e(B @code{nil}) \e$B$r\e(B non-nil \e$B$K@_\e(B
-\e$BDj$9$k$H!"\e(BLDAP \e$B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^\e(B
-\e$B$9!#\e(B
-
-LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
-@code{wl-ldap-base} \e$B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"\e(BLDAP \e$BBP1~$N\e(B XEmacs \e$B0J\e(B
-\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B @command{ldapsearch} \e$B$rMxMQ$7$^$9$N$G!"\e(B
-@command{ldapsearch} \e$B$X$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"\e(B
-\e$B$j$^$9!#\e(B
-
-@node Folder Definition, Start Wanderlust, Mail Addresses, Start Me Up
+@node Folder Definition, Start Wanderlust, Minimal Settings, Start Me Up
 @section \e$B9XFI$9$k%U%)%k%@$NDj5A\e(B
 @cindex Folder Definition
 @cindex .folders
@@ -667,7 +615,7 @@ Emacsen@{
 @}
 #
 # @r{\e$B9TKv$K\e(B @samp{/} \e$B$,$D$/$H!"$=$N%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$,\e(B}
-# @r{\e$B$R$H$D$N%0%k!<%W$H$J$k!#\e(B}
+# @r{\e$B$R$H$D$N%0%k!<%W$H$J$k!J%"%/%;%9%0%k!<%W!K!#\e(B}
 #
 %#mh/expire@@localhost /
 # @r{MH \e$B$N%U%)%k%@A4$F$r$R$H$D$N%0%k!<%W$K$9$kNc!#\e(B}
@@ -688,9 +636,9 @@ Emacsen@{
 \e$B%0%k!<%W$K$O!"#2$D$N<oN`$,$"$j$^$9!#0l$D$O!">e$NNc$N\e(B @samp{Emacsen} \e$B$N$h\e(B
 \e$B$&$KD>@\<+J,$G9%$-$J%U%)%k%@$r%0%k!<%W$H$7$FDj5A$9$k%?%$%W$G$9!#\e(B
 
-\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
+\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+ /} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
 \e$B$O!"$"$k%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$r0l$D$N%0%k!<%W$H$9$k$b$N$G$9!#\e(B
-(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
+(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+ /} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
 \e$B%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
 
 \e$B<B:]$K;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,$o$+$j$d$9$$$H;W$o$l$^$9!#\e(B
@@ -736,6 +684,8 @@ Internal \e$B$N\e(B 11 \e$B<oN`$G$9!#\e(B
 * News Spool Folder::        @samp{=} -- News Spool \e$B%U%)%k%@\e(B
 * Archive Folder::           @samp{$} -- \e$B%"!<%+%$%V%U%)%k%@\e(B
 * POP Folder::               @samp{&} -- POP \e$B%U%)%k%@\e(B
+* Shimbun Folder::           @samp{@@} -- \e$B?7J9%U%)%k%@\e(B
+* Namazu Folder::            @samp{[} -- Namazu \e$B%U%)%k%@\e(B
 * Multi Folder::             @samp{*} -- \e$B%^%k%A%U%)%k%@\e(B
 * Filter Folder::            @samp{/} -- \e$B%U%#%k%?%U%)%k%@\e(B
 * Pipe Folder::              @samp{|} -- \e$B%Q%$%W%U%)%k%@\e(B
@@ -745,8 +695,9 @@ Internal \e$B$N\e(B 11 \e$B<oN`$G$9!#\e(B
 
 @node IMAP Folder, NNTP Folder, Folders, Folders
 @section IMAP \e$B%U%)%k%@\e(B
-@cindex IMAP Folder
 @cindex @samp{%}
+@cindex IMAP Folder
+@cindex Folder, IMAP
 @cindex RFC 2060
 @cindex IMAP4rev1
 
@@ -767,47 +718,48 @@ RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$
            @code{clear} (\e$B$^$?$O\e(B @code{nil}\e$B!#@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
 @end example
 
-(1.14.0 \e$B$h$j0JA0$N%P!<%8%g%s$N\e(B FLIM \e$B$G\e(B CRAM-MD5 \e$B$d\e(B DIGEST-MD5 \e$B$K$h$kG'>Z$r9T$J$&$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B1.14.0 \e$B0J9_$N%P!<%8%g%s$N\e(B FLIM \e$B$G$"$l$P!"K\%Q%C%1!<%8$N\e(B @file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$O$"$j$^$;$s!#\e(B)
-
 default \e$BCM\e(B:
 
 @example
-\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-imap4-user} \e$B$NCM!#\e(B
+\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-imap4-default-user} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
              @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
-\e$BG'>ZK!\e(B    -> \e$BJQ?t\e(B @code{elmo-default-imap4-authenticate-type} \e$B$NCM!#\e(B
+\e$BG'>ZK!\e(B    -> \e$BJQ?t\e(B @code{elmo-imap4-default-authenticate-type} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B @code{login}\e$B!#\e(B
-\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-imap4-server} \e$B$NCM!#\e(B
+\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-imap4-default-server} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B @samp{localhost}\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-default-imap4-port} \e$B$NCM!#\e(B
+\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-imap4-default-port} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B 143\e$B!#\e(B
 @end example
 
-\e$B%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$rJQ?t\e(B @code{elmo-default-imap4-server} 
+\e$B%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$rJQ?t\e(B @code{elmo-imap4-default-server} 
 \e$B$K;XDj$9$k$H!"$$$A$$$A%U%)%k%@L>$K%[%9%HL>$r=q$+$:$K:Q$_$^$9!#Nc$($P%U%!\e(B
 \e$B%$%"%&%)!<%k$r1[$($J$1$l$P$J$i$J$$>l9g$G$b\e(B @samp{foo%imap@@gateway} \e$B$N$h\e(B
 \e$B$&$K;XDj$G$-$^$9!#\e(B
 
 @lisp
-;; \e$BNc\e(B: imap4.exaple.org \e$B$r%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$H$7$F@_Dj\e(B
-(setq elmo-default-imap4-server "imap4.example.org")
+@group
+;; @r{\e$BNc\e(B: imap4.exaple.org \e$B$r%a%$%s$G;HMQ$9$k\e(B IMAP \e$B%5!<%P$H$7$F@_Dj\e(B}
+(setq elmo-imap4-default-server "imap4.example.org")
+@end group
 @end lisp
 
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL (Secure Socket Layer)\e$B$r\e(B
-\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(BSSL \e$B%3%M%/\e(B
-\e$B%7%g%s$rD%$j$^$9!#JQ?t\e(B @code{elmo-default-imap4-stream-type} \e$B$NCM$,\e(B 
+\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(BSSL \e$B%3%M\e(B
+\e$B%/%7%g%s$rD%$j$^$9!#JQ?t\e(B @code{elmo-imap4-default-stream-type} \e$B$NCM$,\e(B 
 @code{ssl} \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} 
 \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
 @lisp
-;; \e$BNc\e(B: SSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k\e(B
-(setq elmo-default-imap4-stream-type 'ssl) 
+@group
+;; @r{\e$BNc\e(B: SSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k\e(B}
+(setq elmo-imap4-default-stream-type 'ssl) 
+@end group
 @end lisp
 
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
-\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C\e(B
-\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
+(OpenSSL \e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,DL$C$F$$$kI,MW$,$"$j$^$9!#\e(B
+STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k$9$kI,\e(B
+\e$BMW$,$"$j$^$9!#\e(B)
 
 \e$BG'>ZK!$H$7$F!"\e(B@code{login}\e$B!"\e(B@code{cram-md5} \e$B$b$7$/$O\e(B @code{digest-md5} 
 \e$B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,\e(B
@@ -817,8 +769,8 @@ default \e$BCM\e(B:
 \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B @code{nil})\e$B!#\e(B
 
 @lisp
-;; \e$BNc\e(B: \e$B@8%Q%9%o!<%I$GG'>Z\e(B
-(setq elmo-default-imap4-authenticate-type 'clear) 
+;; @r{\e$BNc\e(B: \e$B@8%Q%9%o!<%I$GG'>Z\e(B}
+(setq elmo-imap4-default-authenticate-type 'clear) 
 @end lisp
 
 \e$BNc\e(B:
@@ -883,10 +835,17 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 @end example
 @end itemize
 
+
 @node NNTP Folder, MH Folder, IMAP Folder, Folders
 @section NNTP \e$B%U%)%k%@\e(B
-@cindex NNTP Folder
 @cindex @samp{-}
+@cindex NNTP Folder
+@cindex Folder, NNTP
+@cindex Folder, News
+@cindex NetNews
+@cindex News
+@cindex Newsgroup
+@cindex RFC 977
 
 \e$B%M%C%H%K%e!<%9$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 \e$B0l$D$N%K%e!<%9%0%k!<%W$,0l$D$N%U%)%k%@$H$7$F07$o$l$^$9!#\e(B
@@ -901,23 +860,18 @@ ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
 
 default \e$BCM\e(B:
 @example
-\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-nntp-server} \e$B$NCM!#=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
-\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-default-nntp-user} \e$B$NCM!#=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-default-nntp-port} \e$B$NCM!#\e(B
+\e$B%[%9%HL>\e(B  -> \e$BJQ?t\e(B @code{elmo-nntp-default-server} \e$B$NCM!#=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
+\e$B%f!<%6L>\e(B  -> \e$BJQ?t\e(B @code{elmo-nntp-default-user} \e$B$NCM!#=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+\e$B%]!<%HHV9f\e(B-> \e$BJQ?t\e(B @code{elmo-nntp-default-port} \e$B$NCM!#\e(B
              \e$B=i4|@_Dj$O\e(B 119\e$B!#\e(B
 @end example
 
 @var{\e$B%f!<%6L>\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$$$^$9!#\e(B
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 @samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(B SSL \e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-nntp-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+\e$BJQ?t\e(B @code{elmo-nntp-default-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
-(SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
-\e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
-\e$BDL$C$F$$$kI,MW$,$"$j$^$9!#\e(BSTARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C\e(B
-\e$B%1!<%8$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
-
 \e$BNc\e(B:
 
 @example
@@ -930,10 +884,10 @@ default \e$BCM\e(B:
 
 @node MH Folder, Maildir Folder, NNTP Folder, Folders
 @section MH \e$B%U%)%k%@\e(B
-@cindex MH Folder
 @cindex @samp{+}
+@cindex MH Folder
+@cindex Folder, MH
 @pindex MH
-@cindex Maildir
 
 MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -963,9 +917,10 @@ MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)
 
 @node Maildir Folder, News Spool Folder, MH Folder, Folders
 @section Maildir \e$B%U%)%k%@\e(B
-@cindex Maildir Folder
 @cindex @samp{.}
+@cindex Maildir Folder
 @pindex Maildir
+@pindex qmail
 
 Maildir \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -1003,8 +958,8 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 
 @node News Spool Folder, Archive Folder, Maildir Folder, Folders
 @section News Spool \e$B%U%)%k%@\e(B
-@cindex News spool Folder
 @cindex @samp{=}
+@cindex News spool Folder
 @pindex gnspool
 
 Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
@@ -1263,10 +1218,10 @@ OS/2 \e$B$G$O%7%'%k$r2p$5$:$KH/9T$G$-$k%3%^%s%IJ8;zNs$O\e(B 8190 \e$B%P%$%H$^$G$J$N
 @end table
 
 
-@node POP Folder, Multi Folder, Archive Folder, Folders
+@node POP Folder, Shimbun Folder, Archive Folder, Folders
 @section POP \e$B%U%)%k%@\e(B
-@cindex POP Folder
 @cindex @samp{&}
+@cindex POP Folder
 @cindex RFC 1939
 @cindex POP3
 @cindex APOP
@@ -1287,14 +1242,14 @@ RFC 1939 \e$B$G5,Dj$5$l$?\e(B POP3 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$9!#\e(
 default \e$BCM\e(B:
 
 @example
-\e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-user} \e$B$NCM!#\e(B
+\e$B%f!<%6L>\e(B   -> \e$BJQ?t\e(B @code{elmo-pop3-default-user} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B \e$B4D6-JQ?t\e(B @env{USER} \e$B$+!"\e(B@env{LOGNAME} \e$B$+!"\e(B
               @code{(user-login-name)} \e$B$NJV$jCM!#\e(B
-\e$BG'>ZK!\e(B     -> \e$BJQ?t\e(B @code{elmo-default-pop3-authenticate-type} \e$B$NCM!#\e(B
+\e$BG'>ZK!\e(B     -> \e$BJQ?t\e(B @code{elmo-pop3-default-authenticate-type} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B "user"\e$B!#\e(B
-\e$B%[%9%HL>\e(B   -> \e$BJQ?t\e(B @code{elmo-default-pop3-server} \e$B$NCM!#\e(B
+\e$B%[%9%HL>\e(B   -> \e$BJQ?t\e(B @code{elmo-pop3-default-server} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B "localhost"\e$B!#\e(B
-\e$B%]!<%HHV9f\e(B -> \e$BJQ?t\e(B @code{elmo-default-pop3-port} \e$B$NCM!#\e(B
+\e$B%]!<%HHV9f\e(B -> \e$BJQ?t\e(B @code{elmo-pop3-default-port} \e$B$NCM!#\e(B
               \e$B=i4|@_Dj$O\e(B 110\e$B!#\e(B
 @end example
 
@@ -1314,7 +1269,7 @@ APOP \e$B$rMxMQ$9$k$K$O!"\e(B@file{md5.el} \e$B$,I,MW$G$9!#\e(B(XEmacs \e$B$G$OI,MW$"
 archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
 
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-pop3-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+\e$BJQ?t\e(B @code{elmo-pop3-default-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 (SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9$k\e(B
 \e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL \e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
@@ -1322,10 +1277,84 @@ archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
 STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 \e$B$9$kI,MW$,$"$j$^$9!#\e(B)
 
-@node Multi Folder, Filter Folder, POP Folder, Folders
+
+@node Shimbun Folder, Namazu Folder, POP Folder, Folders
+@section \e$B?7J9%U%)%k%@\e(B
+@cindex @samp{@@}
+@cindex Shimbun Folder
+@cindex Folder, Shimbun
+@cindex Folder, Web
+@pindex w3m
+@pindex emacs-w3m
+
+emacs-w3m (@uref{http://emacs-w3m.namazu.org/}) \e$B$rMQ$$$F\e(B
+WWW \e$B>e$N?7J9$d%K%e!<%9%5%$%H!"%a!<%j%s%0%j%9%H%"!<%+%$%V$J$I$r\e(B
+\e$BFI$`$?$a$N%U%)%k%@$G$9!#\e(B
+
+w3m \e$B$*$h$S\e(B emacs-w3m \e$B$,%$%s%9%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
+
+\e$B=q<0\e(B:
+
+@example
+@group
+@samp{@@} @var{\e$B%b%8%e!<%kL>\e(B} @samp{.} @var{\e$B%U%)%k%@L>\e(B}
+@end group
+@end example
+
+@var{\e$B%b%8%e!<%kL>\e(B}\e$B!"$*$h$S\e(B @var{\e$B%U%)%k%@L>\e(B} \e$B$KF~$kCM$K$D$$$F$O\e(B
+emacs-w3m \e$B$KIUB0$N\e(B @file{README.shimbun.ja} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
+
+\e$BNc\e(B:
+
+@example
+@group
+@@airs.wl  -> wanderlust ML \e$B%"!<%+%$%V\e(B (\e$B%b%8%e!<%k\e(B @file{sb-airs.el} \e$B;HMQ\e(B)
+@@asahi/   -> @file{sb-asahi.el} \e$B%b%8%e!<%k$K4^$^$l$k%U%)%k%@$N%"%/%;%9%0%k!<%W\e(B
+@end group
+@end example
+
+
+@node Namazu Folder, Multi Folder, Shimbun Folder, Folders
+@section Namazu \e$B%U%)%k%@\e(B
+@cindex Namazu Folder
+@cindex @samp{[}
+@cindex Folder, Namazu
+@cindex Folder, Text Search
+@pindex Namazu
+@pindex nmz
+namazu (@uref{http://www.namazu.org/}) \e$B$rMQ$$$F!"8!:w<0$K%^%C%A$7$?\e(B
+\e$B%a%C%;!<%8$r=8$a$?2>A[E*$J%U%)%k%@$r9=@.$7$^$9!#\e(B
+
+\e$B=q<0\e(B:
+
+@example
+@group
+@samp{[} @var{namazu \e$B8!:w<0\e(B} @samp{]} [ @var{namazu index \e$B$N%Q%9!J@dBP%Q%9!K\e(B} ]
+@end group
+@end example
+
+namazu index \e$B$N%Q%9$N%G%U%)%k%HCM$O\e(B @code{elmo-nmz-default-index-path} \e$B$G;XDj$G$-$^$9!#\e(B
+
+\e$BNc\e(B:
+
+@example
+@group
+[wanderlust]           -> \e$B%G%U%)%k%H$N\e(B index \e$B$+$i\e(B "wanderlust"
+                          \e$B$K%^%C%A$9$k$b$N$rC5$9\e(B
+[semi flim]~/Mail/semi -> \e$B%G%#%l%/%H%j\e(B "~/Mail/semi" \e$B$K$"$k\e(B index
+                          \e$B$+$i\e(B "semi flim" \e$B$rC5$9\e(B
+@end group
+@end example
+
+Tips
+
+\e$B%U%)%k%@L>F~NO;~$K6uGr$rF~NO$7$?$$>l9g!"\e(B@kbd{C-q @key{SPC}} \e$B$G$G$-$^$9!#\e(B
+
+
+@node Multi Folder, Filter Folder, Namazu Folder, Folders
 @section \e$B%^%k%A%U%)%k%@\e(B
-@cindex Multi Folder
 @cindex @samp{*}
+@cindex Multi Folder
 @cindex Folder, Multiple
 @cindex Folder, Marge
 
@@ -1359,10 +1388,11 @@ STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls \e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 
 @node Filter Folder, Pipe Folder, Multi Folder, Folders
 @section \e$B%U%#%k%?%U%)%k%@\e(B
-@cindex Filter Folder
 @cindex @samp{/}
+@cindex Filter Folder
 @cindex Folder, Filtering
 @cindex Folder, Virtual
+@cindex Folder, Conditional
 
 \e$B;XDj$7$?>r7o$rK~$?$9%a%C%;!<%8$N$_$r4^$`2>A[E*$J%U%)%k%@$G$9!#\e(B
 
@@ -1501,8 +1531,8 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 
 @node Pipe Folder, Internal Folder, Filter Folder, Folders
 @section \e$B%Q%$%W%U%)%k%@\e(B
-@cindex Pipe Folder
 @cindex @samp{|}
+@cindex Pipe Folder
 @cindex Get Message
 @cindex Download Message
 @cindex Incorporate Message
@@ -1545,10 +1575,11 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 
 @node Internal Folder,  , Pipe Folder, Folders
 @section \e$BFbIt%U%)%k%@\e(B
-@cindex Internal Folder
 @cindex @samp{'}
+@cindex Internal Folder
 @cindex Folder, @samp{$} mark
 @cindex Cache
+@c @cindex Folder, Null
 
 Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 
@@ -1557,7 +1588,7 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 @example
 @group
 'mark
-@r{\e$B$b$7$/$O\e(B}
+'sendlog
 'cache/00\e$B!A\e(B1F
 @end group
 @end example
@@ -1573,6 +1604,14 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 (\e$B8=:_!"\e(B@samp{'mark} \e$B%U%)%k%@$+$i$O\e(B IMAP \e$B%5!<%P>e$N%^!<%/$r>C$;$^$;$s!#\e(B
 IMAP \e$B%U%)%k%@$GD>@\>C$7$?>l9g$@$1%5!<%P>e$N%^!<%/$,>C$($^$9!#\e(B)
 
+
+@samp{'sendlog} \e$B$O\e(B @file{~/.elmo/sendlog} \e$B$K5-:\$5$l$F$$$k%a%C%;!<%8$G\e(B
+\e$B%-%c%C%7%e$5$l$F$$$k$b$N$r=8$a$?2>A[%U%)%k%@$G$9!#<+J,<+?H$X$N\e(B cc \e$B$r\e(B
+\e$BIU$1K:$l$?;~$J$I$KM-MQ$+$b$7$l$^$;$s!#\e(B
+\e$B$3$l$rMxMQ$9$k$K$O!"\e(B@code{wl-draft-use-cache} \e$B$r\e(B non-nil \e$B$K@_Dj$7$F!"\e(B
+\e$BAw?.$7$?%a%C%;!<%8$r%-%c%C%7%e$9$k$h$&$K$7$F$/$@$5$$!#\e(B
+
+
 @samp{'cache/00} \e$B!A\e(B @samp{'cache/1F} \e$B$O%M%C%H%o!<%/7PM3$GFI$s$@%a%C%;!<\e(B
 \e$B%8$N%-%c%C%7%e$K%"%/%;%9$9$k$?$a$N%U%)%k%@$G$9!#\e(B00 \e$B!A\e(B 1F \e$B$K$O!"%-%c%C%7%e\e(B
 \e$B%G%#%l%/%H%j\e(B (@file{~/.elmo/cache})\e$B$N%5%V%G%#%l%/%H%jL>$r;XDj$7$^$9!#\e(B
@@ -1854,6 +1893,11 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 \e$B=i4|@_Dj$O\e(B 20\e$B!#\e(B
 @code{wl-stay-folder-window} \e$B$,\e(B non-nil \e$B$N$H$-$K;D$9%U%)%k%@%P%C%U%!$N%&%#%s%I%&$NI}$G$9!#\e(B
 
+@item wl-folder-use-frame
+@vindex wl-folder-use-frame
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+Non-nil \e$B$J$i%U%)%k%@0lMwMQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
+
 @item wl-folder-many-unsync-threshold
 @vindex wl-folder-many-unsync-threshold
 \e$B=i4|@_Dj$O\e(B 70\e$B!#\e(B
@@ -2025,7 +2069,7 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 
 @subsubsection \e$B%U%)%k%@$NJB$SBX$(\e(B
 
-\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($9$k:]!"\e(B@code{wl-fldmgr-sort-func} \e$B$K;XDj\e(B
+\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($9$k:]!"\e(B@code{wl-fldmgr-sort-function} \e$B$K;XDj\e(B
 \e$B$5$l$?4X?t$rMQ$$$^$9!#=i4|@_Dj$G$O\e(B @code{wl-fldmgr-sort-standard} \e$B$,;XDj\e(B
 \e$B$5$l$F$*$j!"$3$l$O%"%k%U%!%Y%C%H=g$KJB$SBX$(%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
 \e$BJB$SBX$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SBX$($O$7$^$;$s!#\e(B
@@ -2255,8 +2299,8 @@ wl-folders-file \e$B$K%;!<%V$9$k!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"%;!<%V$9$k:]$K\e(B @file{~/.folders.bak} 
 \e$B$K%P%C%/%"%C%W$r<h$j$^$9!#\e(B
 
-@item wl-fldmgr-sort-func
-@vindex wl-fldmgr-sort-func
+@item wl-fldmgr-sort-function
+@vindex wl-fldmgr-sort-function
 \e$B=i4|@_Dj$O\e(B @code{wl-fldmgr-sort-standard}\e$B!#\e(Bsort \e$B;~$K;HMQ$9$k4X?t$r;XDj$7\e(B
 \e$B$^$9!#=i4|@_Dj$O!"%"%k%U%!%Y%C%H=g$KJB$Y%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
 (@code{wl-fldmgr-sort-group-first} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)\e$B!#\e(B
@@ -2515,43 +2559,37 @@ prefix argument \e$B$D$-$G\e(B @kbd{/} \e$B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#\e(
 
 @subsection \e$B%P%C%U%!%-%c%C%7%e$H@hFI$_5!G=\e(B
 
-@code{elmo-use-buffer-cache} \e$B$,\e(B non-nil \e$B$G$"$l$P!"0lEYFI$s$@%a%C%;!<%8$,\e(B
-\e$B0lDj?t%P%C%U%!$KJ];}$5$l$^$9!#J];}$9$k%P%C%U%!$N?t$O\e(B 
-@code{elmo-buffer-cache-size} \e$B$G;XDj$7$^$9!#\e(B
+\e$B0lEYFI$s$@%a%C%;!<%8$O0lDj?t%P%C%U%!$KJ];}$5$l$^$9!#\e(B
+\e$BJ];}$9$k%P%C%U%!$N?t$O\e(B 
+@code{wl-message-buffer-cache-size} \e$B$G;XDj$7$^$9!#\e(B
 
 \e$B$^$?!"%a%C%;!<%8$rFI$s$G$$$k4V$K<!$N%a%C%;!<%8$r<hF@$7$F$*$/@hFI$_5!G=$,\e(B
-\e$B$"$j$^$9!#$3$l$O@hFI$_$7$?%a%C%;!<%8$r%P%C%U%!%-%c%C%7%e$KN/$a$F$*$/$?$a!"\e(B
-@code{elmo-use-buffer-cache} \e$B$,\e(B non-nil \e$B$G$"$k$3$H$,I,MW$G$9!#\e(B
+\e$B$"$j$^$9!#\e(B
 
 \e$B$3$N@hFI$_$9$k%U%)%k%@$O<!$N\e(B2\e$B$D$NJQ?t$K$h$j;XDj$G$-$^$9!#\e(B
 
 @table @code
-@item wl-cache-prefetch-folder-type-list
-@vindex wl-cache-prefetch-folder-type-list
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
-@lisp
-@group
-(nntp imap4)
-@end group
-@end lisp
-
-@noindent
-\e$B@hFI$_5!G=$rM-8z$K$9$k%U%)%k%@$r<oJL$N%j%9%H$G;XDj$7$^$9!#=i4|@_Dj$N>l9g!"\e(B
-\e$B$b$7\e(B localdir \e$B$H\e(B IMAP \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B IMAP \e$B$N%a%C%;!<\e(B
-\e$B%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B @code{wl-cache-prefetch-folder-list} 
-\e$B$h$j$bM%@h$5$l$^$9!#\e(B
-
-\e$B$b$7!"\e(Blocaldir \e$B$H\e(B localnews \e$B%U%)%k%@$b@hFI$_$9$k>l9g$O<!$N$h$&$K;XDj$7$^$9!#\e(B
+@item wl-message-buffer-prefetch-folder-type-list
+@vindex wl-message-buffer-prefetch-folder-type-list
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#$3$N>l9g!"A4$F$N%U%)%k%@$G@hFI$_5!G=$,M-8z$K$J$j$^\e(B
+\e$B$9!#FCDj$N%U%)%k%@<oJL$N>l9g$K$@$1@hFI$_5!G=$rM-8z$K$7$?$$>l9g$K$O!"%U%)\e(B
+\e$B%k%@<oJL$N%j%9%H$r;XDj$7$^$9!#\e(B
+\e$BNc$($P0J2<$N$h$&$K@_Dj$7$^$9!#\e(B(NNTP \e$B%U%)%k%@$H\e(B IMAP \e$B%U%)%k%@$G$@$1@hFI$_\e(B
+\e$B$7$?$$>l9g\e(B)
 
 @lisp
 @group
-(setq wl-cache-prefetch-folder-type-list
-      '(nntp imap4 localdir localnews))
+(setq wl-message-buffer-prefetch-folder-type-list
+      '(nntp imap4))
 @end group
 @end lisp
 
-@item wl-cache-prefetch-folder-list
-@vindex wl-cache-prefetch-folder-list
+\e$B$3$N>l9g!"$b$7\e(B localdir \e$B$H\e(B IMAP \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B 
+IMAP \e$B$N%a%C%;!<%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B 
+@code{wl-message-buffer-prefetch-folder-list} \e$B$h$j$bM%@h$5$l$^$9!#\e(B
+
+@item wl-message-buffer-prefetch-folder-list
+@vindex wl-message-buffer-prefetch-folder-list
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B@hFI$_5!G=$rM-8z$K$9$k%U%)%k%@$r%U%)%k%@L>\e(B(\e$B@55,I=8=\e(B)\e$B$N%j%9%H$G;XDj$7$^$9!#\e(B
 @end table
@@ -2915,11 +2953,11 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 @kindex # (Summary)
 @findex wl-summary-print-message
 \e$B8=:_$N%a%C%;!<%8$NFbMF$r0u:~$7$^$9!#\e(BEmacs 20\e$B0J9_\e(B \e$B$G$O\e(B @code{ps-print} \e$B$r\e(B
-\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-func} \e$B$r\e(B
+\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-function} \e$B$r\e(B
 @code{ps-print-buffer} \e$B$K@_Dj$7$?$[$&$,NI$$$+$b$7$l$^$;$s!#\e(B
 
 @lisp
-(setq wl-ps-print-buffer-func 'ps-print-buffer)
+(setq wl-ps-print-buffer-function 'ps-print-buffer)
 @end lisp
 
 @noindent
@@ -3256,6 +3294,8 @@ prefix argument \e$B$D$-$J$i$P%+!<%=%k9T$,$"$k%a%C%;!<%8$r4^$`%9%l%C%IA4$F$rJ]B8$
 @kindex m i (Summary)
 @findex wl-summary-target-mark-prefetch
 \e$B$^$H$a=hM}MQ%^!<%/\e(B @samp{*} \e$B$N$D$$$?%a%C%;!<%8$rA4$F%W%j%U%'%C%A$7$^$9!#\e(B
+prefix argument \e$B$D$-$J$i$P4{$K%-%c%C%7%e$5$l$F$$$k%a%C%;!<%8$b\e(B
+\e$B:FEY%W%j%U%'%C%A$7$^$9!#\e(B
 (@code{wl-summary-target-mark-prefetch})
 
 @item m R
@@ -3406,10 +3446,21 @@ Non-nil \e$B$J$i%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$KI=<($7$^$9!#\e(B
 
 @item wl-auto-select-next
 @vindex wl-auto-select-next
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(BNon-nil \e$B$J$i!"$"$k%U%)%k%@$N%5%^%j$+$i<!$N%U%)%k\e(B
-\e$B%@$N%5%^%j$X<+F0E*$K0\F0$7$^$9!#CM$,\e(B @code{unread} \e$B$J$i!"3NG'$r5a$a$FL$\e(B
-\e$BFI%a%C%;!<%8$,$J$$%U%)%k%@$K0\F0$7$^$9!#CM$,\e(B @code{skip-no-unread} \e$B$J$i!"\e(B
-\e$BL$FI%a%C%;!<%8$,$J$$%U%)%k%@$r<+F0E*$KHt$P$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$KL$FI%a%C%;!<%8$,$J$/$J$C$?;~$NF0:n$r;XDj$7$^$9!#\e(B
+
+@example
+nil\e$B!'\e(B \e$B%U%)%k%@%b!<%I$KLa$k$+?R$M$k\e(B
+'unread\e$B!'\e(B \e$B<!$NL$FI$"$j$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+  \e$B0\F0@h$N%U%)%k%@$G\e(B crosspost \e$B=hM}$d\e(B Score \e$B5!G=$J$I$K$h$j\e(B
+  \e$BL$FI$,$J$/$J$l$P!"$5$i$K<!$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+'skip-no-unread\e$B!'\e(B unread \e$B$HF1MM!#\e(B
+  \e$B$?$@$7!"0\F0$7$?@h$GL$FI$,$J$/$J$C$?>l9g$K$O!"<+F0E*$K<!$N\e(B
+  \e$B%U%)%k%@$K9T$/!#\e(B
+\e$B>e5-0J30!'\e(B \e$B<!$NL$FI$"$j$N%U%)%k%@$K9T$/$+?R$M$k!#\e(B
+@end example
+
+\e$B%9%Z!<%9%-!<$G$R$?$9$iFI$_?J$a$?$$?M$O\e(B @code{'skip-no-unread} \e$B$K$7$F$*$/$N$,\e(B
+\e$BJXMx$+$b$7$l$^$;$s!#\e(B
 
 @item wl-thread-insert-opened
 @vindex wl-thread-insert-opened
@@ -3435,10 +3486,11 @@ Non-nil \e$B$J$i%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$KI=<($7$^$9!#\e(B
 @vindex  wl-summary-weekday-name-lang
 \e$B=i4|@_Dj$O\e(B @samp{ja}\e$B!#%5%^%j$NMKF|I=<($N8@8l$r;XDj$7$^$9!#\e(B@samp{en} \e$B$J$i\e(B
 \e$B1Q8l!"\e(B@samp{fr} \e$B$J$i%U%i%s%98l!"\e(B@samp{de} \e$B$J$i%I%$%D8l$H$J$j$^$9!#\e(B
+\e$BCM$rJQ99$7$?8e$K$O!"%5%^%j$r\e(B rescan \e$B$7$F2<$5$$!#\e(B
 
 @item wl-summary-fix-timezone
 @vindex wl-summary-fix-timezone
-\e$B=i4|@_Dj$O\e(B @samp{nil}\e$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$NF|;~I=<($r;XDj$7$?%?%$%`%>!<%s$KD>$7$^$9!#\e(B
 @code{nil} \e$B$J$i$P!"%G%U%)%k%H$N%?%$%`%>!<%s$r;2>H$7$FD>$7$^$9!#\e(B
 \e$B%G%U%)%k%H$N%?%$%`%>!<%s$H$O!"%7%9%F%`$K$"$i$+$8$a@_Dj$5$l$?%?%$%`%>!<%s$+!"\e(B
 \e$B4D6-JQ?t\e(B @samp{TZ} \e$B$NCM$G$9!#\e(B
@@ -3458,16 +3510,6 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B '(1 . 4)\e$B!#\e(B
 \e$B%5%^%j$rI=<($9$k%&%#%s%I%&$H%a%C%;!<%8K\BN$rI=<($9$k%&%#%s%I%&$NHf$r\e(B cons \e$B$G;XDj$7$^$9!#\e(Bcar:cdr \e$B$,\e(B \e$B%5%^%j\e(B:\e$B%a%C%;!<%8\e(B \e$B$G$9!#\e(B
 
-@item wl-summary-recenter
-@vindex  wl-summary-recenter
-\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
-\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
-
-@item wl-summary-indent-length-limit
-@vindex  wl-summary-indent-length-limit
-\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
-\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
-
 @item wl-summary-no-from-message
 @vindex  wl-summary-no-from-message
 \e$B=i4|@_Dj$O\e(B @samp{nobody@@nowhere?}\e$B!#\e(B
@@ -3478,10 +3520,10 @@ Non-nil \e$B$J$i!"\e(B@samp{^L} \e$B$G2~%Z!<%8$7$F%a%C%;!<%8$rI=<($7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @samp{(WL:No Subject in original.)}\e$B!#%a%C%;!<%8$K\e(B 
 @samp{Subject:} \e$B$,L5$+$C$?>l9g$K%5%^%j$KI=<($9$kJ8;zNs$G$9!#\e(B
 
-@item wl-summary-width
-@vindex  wl-summary-width
-\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
-\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
+@item wl-summary-use-frame
+@vindex wl-summary-use-frame
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+Non-nil \e$B$J$i%5%^%jI=<(MQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
 @item wl-use-folder-petname
 @vindex  wl-use-folder-petname
@@ -3514,10 +3556,32 @@ petname \e$B$G$bJd40$,$G$-$^$9!#\e(B
 @kbd{n}, @kbd{N} \e$B$N7k2L$G!"<!$N%a%C%;!<%8$,>e$+2<$+$r@Z$jBX$($k!#FI$s$G\e(B
 \e$B$$$kJ}8~$r0U<1$7$?$$$H$-$O\e(B @code{t} \e$B$K$9$k$HNI$$$G$7$g$&!#\e(B
 
-@item wl-from-width
-@vindex wl-from-width
+@item wl-summary-width
+@vindex  wl-summary-width
+\e$B=i4|@_Dj$O\e(B 80\e$B!#%5%^%j$NI=<(I}$r@_Dj$5$l$?CM$K@Z$j5M$a$^$9!#\e(B@code{nil} \e$B$J\e(B
+\e$B$iI=<(I}$r@Z$j5M$a$^$;$s!#\e(B
+
+@item wl-summary-from-width
+@vindex wl-summary-from-width
 \e$B=i4|@_Dj$O\e(B 17\e$B!#%5%^%j$N\e(B From \e$BItJ,$NI=<(I}$G$9!#\e(B
 
+@item wl-summary-subject-length-limit
+@vindex wl-summary-subject-length-limit
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#%5%^%j$N\e(B Subject \e$BItJ,$NI=<(I}$N>e8B$G$9!#\e(B
+@code{nil} \e$B$N>l9g!"\e(BSubject \e$BItJ,$ND9$5$N@)8B$r$7$^$;$s!#\e(B
+
+@item wl-summary-indent-length-limit
+@vindex  wl-summary-indent-length-limit
+\e$B=i4|@_Dj$O\e(B 46\e$B!#@_Dj$5$l$?CM0J>e%5%^%j$r%$%s%G%s%H$7$^$;$s!#\e(B@code{nil} \e$B$J\e(B
+\e$B$i%5%^%j$N%$%s%G%s%H$rL5@)8B$K$7$^$9!#\e(B
+\e$BCM$r\e(B @code{nil} \e$B$K$9$k$H$-$O!"\e(B@code{wl-summary-width} \e$B$b\e(B @code{nil} \e$B$K@_Dj\e(B
+\e$B$9$k$H$h$$$G$7$g$&!#\e(B
+
+@item wl-summary-recenter
+@vindex  wl-summary-recenter
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i$PI=<($7$?$H$-$KI=<(Cf$N%a%C%;!<%8$N%5\e(B
+\e$B%^%j9T$r%&%#%s%I%&$NCf1{IU6a$K0\F0$5$;$^$9!#\e(B
+
 @item wl-summary-divide-thread-when-subject-changed
 @vindex wl-summary-divide-thread-when-subject-changed
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -3530,13 +3594,13 @@ Non-nil \e$B$J$i%5%V%8%'%/%H$,JQ$o$C$?$H$-$K%9%l%C%I$r@Z$j$^$9!#\e(B
 Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8\e(B
 \e$B$r8+$D$1$k$3$H$,$G$-$J$+$C$?$H$-$K!"\e(B
 @code{wl-summary-jump-to-msg-by-message-id-via-nntp} \e$B$r8F$S!"\e(B
-@code{elmo-default-nntp-server} \e$B$G;XDj$5$l$?%5!<%P$+$i8!:w$7$^$9!#$3$N$H\e(B
-\e$B$-\e(B @code{elmo-default-nntp-user}, @code{elmo-default-nntp-port},
-@code{elmo-default-nntp-stream-type} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
+@code{elmo-nntp-default-server} \e$B$G;XDj$5$l$?%5!<%P$+$i8!:w$7$^$9!#$3$N$H\e(B
+\e$B$-\e(B @code{elmo-nntp-default-user}, @code{elmo-nntp-default-port},
+@code{elmo-nntp-default-stream-type} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
 
-@code{confirm} \e$B$J$i\e(B @code{elmo-default-nntp-*} \e$B$G;XDj$5$l$?%5!<%P$+$i8!\e(B
+@code{confirm} \e$B$J$i\e(B @code{elmo-nntp-default-*} \e$B$G;XDj$5$l$?%5!<%P$+$i8!\e(B
 \e$B:w$9$k$+!"%5!<%P$r;XDj$9$k$+$r3NG'$7$^$9!#$3$N>l9g!"%5!<%P$N%[%9%HL>!"$b\e(B
-\e$B$7$/$O\e(B @samp{-:username@@servername:119!}  \e$B$N$h$&$K\e(B NTTP \e$B%U%)%k%@7A<0$G$N\e(B
+\e$B$7$/$O\e(B @samp{-:username@@servername:119!}  \e$B$N$h$&$K\e(B NNTP \e$B%U%)%k%@7A<0$G$N\e(B
 \e$B;XDj$,2DG=$G$9!#\e(B
 
 @item wl-summary-keep-cursor-command
@@ -3555,7 +3619,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @item wl-summary-update-confirm-threshold
 @vindex wl-summary-update-confirm-threshold
 \e$B=i4|@_Dj$O\e(B 500\e$B!#$3$NCM$h$j%5%^%j$N99?7?t$,B?$$>l9g!"0lItJ,$@$199?7$9$k$+\e(B
-\e$B$I$&$+!"<ALd$7$^$9!#\e(B
+\e$B$I$&$+!"<ALd$7$^$9!#\e(B@code{nil} \e$B$K$9$k$H!"3NG'$;$:$KA4$F$r99?7$7$^$9!#\e(B
 
 @item wl-summary-always-sticky-folder-list
 @vindex wl-summary-always-sticky-folder-list
@@ -3628,6 +3692,11 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"\e(BPOP3 \e$B$GFI$s$@%a%C%;!<%8$r%-%c%C%7%e$7\e(B
 \e$B$^$9!#\e(B
 
+@item elmo-shimbun-use-cache
+@vindex elmo-shimbun-use-cache
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"?7J9%U%)%k%@$GFI$s$@%a%C%;!<%8$r\e(B
+\e$B%-%c%C%7%e$7$^$9!#\e(B
+
 @item wl-folder-process-duplicates-alist
 @vindex wl-folder-process-duplicates-alist
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#=EJ#$7$?%a%C%;!<%8$,F1$8%U%)%k%@$K$"$k>l9g$NF0:n\e(B
@@ -3656,9 +3725,10 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @node Message, Draft, Summary, Top
 @chapter \e$B%a%C%;!<%8%P%C%U%!\e(B
 
-\e$B%a%C%;!<%8%P%C%U%!$O\e(B SEMI/tm \e$B$N\e(B MIME-View mode \e$B$G$9!#\e(B
+\e$B%a%C%;!<%8%P%C%U%!$O\e(B SEMI \e$B$N\e(B MIME-View mode \e$B$G$9!#\e(B
 \e$BA`:n$NJ}K!!"%-!<%P%$%s%I$O$=$l$>$l$N%I%-%e%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
 @xref{MIME-View, , ,mime-ui-ja, a MIME user interface for GNU Emacs}.
+\e$B$^$?!"%a%C%;!<%8%P%C%U%!$K$*$$$F!"\e(B@kbd{?} \e$B$G%X%k%W$,;2>H$G$-$^$9!#\e(B
 
 \e$B%a%C%;!<%8$N@hF,$G\e(B @kbd{p}\e$B!"%a%C%;!<%8$N:G8eHx$G\e(B @kbd{n} \e$B$r2!$9$H!"%5%^\e(B
 \e$B%j%b!<%I$KLa$j$^$9!#$^$?!"\e(B@kbd{l} \e$B$r2!$9$H!"%5%^%j%b!<%I%P%C%U%!$NI=<($,\e(B
@@ -3703,24 +3773,32 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @vindex wl-message-window-size
 \e$B=i4|@_Dj$O\e(B @code{(1 . 4)}\e$B!#\e(Bcons \e$B%;%k$G!"\e(Bcar \e$BCM\e(B: cdr \e$BCM$,%5%^%j$N%&%#%s%I\e(B
 \e$B%&I}!'%a%C%;!<%8$N%&%#%s%I%&I}$H$J$j$^$9!#\e(B
+
 @item wl-message-ignored-field-list
 @vindex wl-message-ignored-field-list
-(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI=<($7$J$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
 \e$B;XDj$7$^$9!#\e(B
-nil \e$B$J$i!"\e(Bmime-view-ignored-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+@code{nil} \e$B$J$i!"\e(B@code{mime-view-ignored-field-list} \e$B$NCM$,;H$o$l$^$9!#\e(B
+
 @item wl-message-visible-field-list
 @vindex wl-message-visible-field-list
-(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI,$:I=<($7$?$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
-\e$B;XDj$7$^$9!#\e(Bwl-message-ignored-field-list \e$B$h$jM%@h$5$l$^$9!#\e(B
-nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+\e$B;XDj$7$^$9!#\e(B@code{wl-message-ignored-field-list} \e$B$h$jM%@h$5$l$^$9!#\e(B
+@code{nil} \e$B$J$i!"\e(B@code{mime-view-visible-field-list} \e$B$NCM$,;H$o$l$^$9!#\e(B
+
 @item wl-message-sort-field-list
 @vindex wl-message-sort-field-list
 (SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B 
 '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From")\e$B!#\e(B
 \e$B%a%C%;!<%8%P%C%U%!$KI=<($9$k%X%C%@%U%#!<%k%I$N=gHV$r@55,I=8=$N%j%9%H$G\e(B
 \e$B;XDj$7$^$9!#\e(B
+
+@item wl-message-truncate-lines
+@vindex wl-message-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%a%C%;!<%8%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
 @end table
 
 
@@ -3750,9 +3828,10 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 
 @subsection \e$B%a%C%;!<%8$NJT=8\e(B
 
-\e$B%^%k%A%Q!<%H$NJT=8$O\e(B SEMI/tm \e$B$N\e(B MIME \e$BJT=8%b!<%I$rMxMQ$7$F$$$^$9!#\e(B
+\e$B%^%k%A%Q!<%H$NJT=8$O\e(B SEMI \e$B$N\e(B MIME \e$BJT=8%b!<%I$rMxMQ$7$F$$$^$9!#\e(B
 \e$BJT=8$NJ}K!$O3F%Q%C%1!<%8IUB0$N%I%-%e%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
 @xref{MIME-Edit, , ,mime-ui-ja, a MIME user interface for GNU Emacs}.
+\e$B$^$?!"%I%i%U%H%P%C%U%!$K$*$$$F!"\e(B@kbd{C-c C-x ?} \e$B$G%X%k%W$,;2>H$G$-$^$9!#\e(B
 
 @subsection \e$B%a%C%;!<%8$NF0E*$JJQ99\e(B
 @vindex wl-draft-config-alist
@@ -3809,6 +3888,7 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 
 @example
 'header:      \e$B%X%C%@$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
+'header-top:  \e$B%X%C%@$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'header-file: \e$B%X%C%@$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
 'x-face:      \e$B;XDj$7$?%U%!%$%k$NFbMF$r;}$D\e(B @samp{X-Face:} \e$B%U%#!<%k%I$r\e(B
               \e$BA^F~$7$^$9!#\e(B
@@ -3819,6 +3899,8 @@ nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
 'body-file:   \e$BK\J8$r;XDj$7$?%U%!%$%k$NFbMF$GCV$-49$($^$9!#\e(B
 'bottom:      \e$BK\J8$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'bottom-file: \e$BK\J8$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
+'part-top:    \e$B8=:_$N%^%k%A%Q!<%H$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
+'part-bottom: \e$B8=:_$N%^%k%A%Q!<%H$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'template:    \e$B;XDj$7$?%F%s%W%l!<%H$rE,MQ$7$^$9!#\e(B
               (\e$B<!9`\e(B \e$B%F%s%W%l!<%H$NA^F~;2>H\e(B)
 @end example
@@ -3949,7 +4031,7 @@ POP-before-SMTP \e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 \e$B@_Dj$O!"\e(B
 
 @lisp
-(setq wl-draft-send-mail-func 'wl-draft-send-mail-with-pop-before-smtp)
+(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)
 @end lisp
 
 @noindent
@@ -3958,29 +4040,29 @@ POP-before-SMTP \e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 @table @code
 @item wl-pop-before-smtp-user
 POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%f!<%6L>$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-user} \e$B$,;H$o$l$^$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-user} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-server
 POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%5!<%PL>$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-server} \e$B$,;H$o$l$^$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-server} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-authenticate-type
 POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$BG'>ZJ}<0$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-default-pop3-authenticate-type}
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B @code{elmo-pop3-default-authenticate-type}
 \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-port
 POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(B POP \e$B%]!<%HHV9f$G$9!#\e(B
-\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B  @code{elmo-default-pop3-port} \e$B$,;H$o$l$^$9!#\e(B
+\e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B  @code{elmo-pop3-default-port} \e$B$,;H$o$l$^$9!#\e(B
 
 @item wl-pop-before-smtp-stream-type
 Non-nil \e$B$J$i\e(B SSL \e$B$rMxMQ$7$F\e(B POP \e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B@code{starttls} 
 \e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J\e(B
-\e$B$$>l9g$O\e(B @code{elmo-default-pop3-stream-type} \e$B$,;H$o$l$^$9!#\e(B
+\e$B$$>l9g$O\e(B @code{elmo-pop3-default-stream-type} \e$B$,;H$o$l$^$9!#\e(B
 @end table
 
 POP-before-SMTP \e$BMQ$NJQ?t\e(B (@code{wl-pop-before-smtp-*})\e$B$,@_Dj$5$l$F$$$J$$\e(B
-\e$B>l9g$O!"\e(BPOP \e$B%U%)%k%@$N@_Dj\e(B (@code{elmo-default-pop3-*}) \e$B$,MQ$$$i$l$^$9!#\e(B
+\e$B>l9g$O!"\e(BPOP \e$B%U%)%k%@$N@_Dj\e(B (@code{elmo-pop3-default-*}) \e$B$,MQ$$$i$l$^$9!#\e(B
 \e$B$=$N$?$a!"\e(BSMTP \e$B%5!<%P$H\e(B POP \e$B%5!<%P$N<BBN$,F1$8$G!"%G%U%)%k%H@_Dj$N\e(B POP \e$B%U%)%k\e(B
 \e$B%@\e(B(@samp{&} \e$B$J$I\e(B)\e$B$,MxMQ2DG=$J$i!"@_Dj$OITMW$G$9!#\e(B
 
@@ -4058,6 +4140,12 @@ MIME \e$B$N%^%k%A%Q!<%H%a%C%;!<%8$N3NG'$K;H$&$HJXMx$G$9!#\e(B
 \e$B;XDj$5$l$?%j!<%8%g%s$r%7!<%60E9f$G%(%s%3!<%I\e(B/\e$B%G%3!<%I$7$^$9!#\e(B
 (@code{wl-caesar-region})
 
+@item C-l
+@kindex C-l (Draft)
+@findex wl-draft-highlight-and-recenter
+\e$B8=:_$N%I%i%U%H$r%O%$%i%$%H$7$J$*$7$^$9!#\e(B
+(@code{wl-draft-highlight-and-recenter})
+
 @item M-t
 @kindex M-t (Draft)
 @findex wl-toggle-plugged
@@ -4086,13 +4174,10 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 
 @item C-c C-a
 @kindex C-c C-a (Draft)
-@findex wl-draft-insert-x-face-field
-\e$B%U%!%$%k\e(B @file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM\e(B) \e$B$NFbMF$r\e(B
-\e$B%I%i%U%H%P%C%U%!$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$7$^$9!#\e(B
-
-\e$B%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r$"$i$+$8$a%U%!%$%k\e(B @file{~/.xface}
-\e$B$NFbMF$KMQ0U$7$F$*$/I,MW$,$"$j$^$9!#\e(B
-(@code{wl-draft-insert-x-face-field})
+@findex wl-addrmgr
+\e$B%"%I%l%9%^%M!<%8%c$r5/F0$7$^$9!#\e(B
+@xref{Address Manager}.
+(@code{wl-addrmgr})
 @end table
 
 @section \e$B%+%9%?%^%$%:JQ?t\e(B
@@ -4132,8 +4217,7 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$G$+$D!"%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r\e(B 
 @file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
 \e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5\e(B
-\e$B$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s$,!"\e(B@kbd{C-c C-a} \e$B$r\e(B
-\e$B2!$9$H%X%C%@It$KA^F~$5$l$^$9!#\e(B
+\e$B$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s!#\e(B
 
 @item wl-insert-message-id
 @vindex wl-insert-message-id
@@ -4210,6 +4294,11 @@ Non-nil \e$B$J$i%&%#%s%I%&$rI=<($7$J$,$i%F%s%W%l!<%H$rA*Br$9$k>l9g!"%j%?!<%s\e(B
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 Non-nil \e$B$J$i%I%i%U%HMQ$K?7$7$$%U%l!<%`$r3+$-$^$9!#\e(B
 
+@item wl-draft-truncate-lines
+@vindex wl-draft-truncate-lines
+\e$B=i4|@_Dj$O\e(B @code{default-truncate-lines} \e$B$NCM$,;H$o$l$^$9!#\e(B
+Non-nil \e$B$J$i%I%i%U%H%P%C%U%!$GD9$$9T$N@^$jJV$7$r$7$^$;$s!#\e(B
+
 @item wl-from
 @vindex wl-from
 \e$B=i4|@_Dj$OJQ?t\e(B @code{user-mail-address} \e$B$NCM!#\e(B
@@ -4261,6 +4350,11 @@ Non-nil \e$B$J$iJV?.%"%I%l%9$N\e(B @samp{To:}, @samp{Cc:} \e$B%U%#!<%k%I$KAj<j$N%U%
 \e$B%i%0$G$9!#\e(BNon-nil \e$B$J$i%-%c%C%7%e$7$^$9!#$?$@$7\e(B @code{wl-insert-message-id}\e$B$,\e(B
 nil \e$B$N>l9g$O%-%c%C%7%e$5$l$^$;$s!#\e(B
 
+@item wl-fcc-force-as-read
+@vindex wl-fcc-force-as-read
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(BNon-nil \e$B$J$i\e(B @samp{Fcc:} \e$B$GJ]B8$7$?%a%C%;!<%8$r\e(B
+\e$B4{FI$K$7$^$9\e(B(\e$BJ]B8@h$,\e(B IMAP folder \e$B$N>l9g$N$_\e(B)\e$B!#\e(B
+
 @item wl-auto-flush-queue
 @vindex wl-auto-flush-queue
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
@@ -4316,25 +4410,25 @@ SMTP \e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
 @vindex wl-nntp-posting-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$N\e(B NNTP \e$B%5!<%PL>$G$9!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-server} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-nntp-posting-user
 @vindex wl-nntp-posting-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$K\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-user} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-user} \e$B$r;H$$$^$9!#\e(B
 \e$B$=$l$G$b\e(B @code{nil} \e$B$J$i\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$$$^$;$s!#\e(B
 
 @item wl-nntp-posting-port
 @vindex wl-nntp-posting-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$N\e(B NNTP \e$B%5!<%P$N%]!<%HHV9f!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-server} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-nntp-posting-stream-type
 @vindex wl-nntp-posting-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-stream-type} \e$B$rI>2A$7$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-nntp-default-stream-type} \e$B$rI>2A$7$^$9!#\e(B
 Non-nil \e$B$J$i%K%e!<%9Ej9F;~$K\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
 @code{starttls}\e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
@@ -4342,31 +4436,31 @@ Non-nil \e$B$J$i%K%e!<%9Ej9F;~$K\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
 @vindex wl-pop-before-smtp-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-user}\e$B$rMxMQ$7$^$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-user}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-server
 @vindex wl-pop-before-smtp-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%5!<%PL>$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-server}\e$B$rMxMQ$7$^$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-server}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-authenticate-type
 @vindex wl-pop-before-smtp-authenticate-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-authenticate}\e$B$rMxMQ$7$^$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-authenticate}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-port
 @vindex wl-pop-before-smtp-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B POP \e$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-port}\e$B$rMxMQ$7$^$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-pop3-default-port}\e$B$rMxMQ$7$^$9!#\e(B
 
 @item wl-pop-before-smtp-stream-type
 @vindex wl-pop-before-smtp-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B SSL \e$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B@code{nil} \e$B$N\e(B
-\e$B$^$^$J$i\e(B @code{elmo-default-pop3-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
+\e$B$^$^$J$i\e(B @code{elmo-pop3-default-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
 @code{starttls}\e$B$J$i\e(B STARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @item wl-draft-queue-save-variables
@@ -4620,7 +4714,7 @@ plug \e$B>uBV$K$h$j\e(B 2\e$B9TL\$N\e(B @samp{(wl-plugged)} \e$B$,JQ2=$7$^$9!#\e(B
 \e$B$5$i$K:Y$+$/%5!<%P$d%]!<%HKh$K%*%U%i%$%s>uBV$r@_Dj$9$k$3$H$b$G$-$^$9!#J;\e(B
 \e$B$;$FJQ?t\e(B @code{wl-reset-plugged-alist} \e$B$b;2>H2<$5$$!#\e(B
 
-\e$BDL>o!"5/F0;~$K$O\e(B @file{~/.folder} \e$B$H\e(B @code{wl-smtp-posting-server},
+\e$BDL>o!"5/F0;~$K$O\e(B @file{~/.folders} \e$B$H\e(B @code{wl-smtp-posting-server},
 @code{wl-nntp-posting-server} \e$B$J$I$+$i3F%]!<%H$N\e(B plug \e$B>uBV$,<+F0E*$KDI2C\e(B
 \e$B$5$l$^$9$,!"$3$l$i$N%]!<%H$N\e(B plug \e$B>uBV$rJQ99$7$?$j!">e5-0J30$N%]!<%H$rDI2C\e(B
 \e$B$7$?$j$9$k>l9g$K$O\e(B @code{wl-make-plugged-hook} \e$B$KJQ99$9$k4X?t$r5-=R$7$^\e(B
@@ -5053,8 +5147,8 @@ Non-nil \e$B$K$9$k$H!"\e(B
 \e$B;D$7$F$*$/%a%C%;!<%8?t$K\e(B @code{wl-summary-expire-reserve-marks} \e$B$G@_Dj$5\e(B
 \e$B$l$?%a%C%;!<%8$r4^$a$^$9!#\e(B
 
-@item wl-expire-archive-get-folder-func
-@vindex wl-expire-archive-get-folder-func
+@item wl-expire-archive-get-folder-function
+@vindex wl-expire-archive-get-folder-function
 \e$B=i4|@_Dj$O\e(B @code{wl-expire-archive-get-folder}\e$B!#\e(B
 
 \e$B:o=|@h$NI8=`4X?t$G%"!<%+%$%V%U%)%k%@L>$r<hF@$9$k4X?t$r;XDj$7$^$9!#\e(B
@@ -5222,7 +5316,7 @@ expire \e$B$J$I$NF0:n$K$O1F6A$O$"$j$^$;$s!#\e(B
 \e$B$9$k$@$1$K$J$j$^$9!#\e(B
 
 \e$B%G%U%)%k%H$G$O%3%T!<@h$N%"!<%+%$%V%U%)%k%@$O\e(B
-@code{wl-expire-archive-get-folder-func} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
+@code{wl-expire-archive-get-folder-function} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
 prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!"\e(B
 \e$B;XDj$7$?%U%)%k%@$K%3%T!<$9$k$3$H$,$G$-$^$9!#\e(B
 
@@ -5236,7 +5330,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 
 @itemize @bullet
 @item @code{wl-expire-archive-files}
-@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-get-folder-function}
 @item @code{wl-expire-archive-folder-name-fmt}
 @item @code{wl-expire-archive-folder-type}
 @item @code{wl-expire-archive-folder-prefix}
@@ -5261,7 +5355,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 @end table
 
 
-@node Scoring, Customization, Expire and Archive, Top
+@node Scoring, Address Book, Expire and Archive, Top
 @chapter \e$B%9%3%"\e(B
 @cindex Scoring
 @c @cindex Kill File
@@ -5748,7 +5842,129 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @end example
 
 
-@node Customization, Mailing List, Scoring, Top
+@node Address Book, Customization, Scoring, Top
+@chapter \e$B%"%I%l%9D"\e(B
+@cindex Address Book
+
+\e$B%"%I%l%9D"$rMxMQ$9$k$3$H$G!"%a!<%k%"%I%l%9$r4JC1$KF~NO$7$?$j!$\e(B
+\e$B%5%^%j$NI=<($K%Z%C%H%M!<%`$rMQ$$$k$3$H$,=PMh$^$9!#\e(B
+
+@menu
+* Mail Addresses::   \e$B%"%I%l%9D"$NDj5A\e(B
+* Address Manager::  \e$B%"%I%l%9%^%M!<%8%c\e(B
+@end menu
+
+@node Mail Addresses, Address Manager, Address Book, Address Book
+@section \e$B%"%I%l%9D"$NDj5A\e(B
+@cindex Address book Definition
+@cindex .addresses
+@cindex Alias, Address
+
+\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
+@file{~/.addresses} \e$B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<\e(B
+\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$J$*!"\e(B
+\e$B5/F0$7$?>uBV$G%5%^%j%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9$rDI2C\e(B/
+\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
+
+\e$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J46$8$G$9!#\e(B
+
+@example
+@group
+#
+# @r{@samp{#} \e$B$G;O$^$k9T$O%3%a%s%H!#\e(B}
+# @r{\e$B6u9T$OL5;k!#\e(B}
+#
+# @var{\e$B%a!<%k%"%I%l%9\e(B}  "@var{\e$B$"$@L>\e(B}"  "@var{\e$BK\L>\e(B}"
+#
+teranisi@@gohome.org            "\e$B$F$i$K$7\e(B"      "\e$B;{@>M50l\e(B"
+foo@@bar.gohome.org             "Foo \e$B$5$s\e(B"      "John Foo"
+bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
+@end group
+@end example
+
+@noindent
+\e$B0l9T$,0l?MJ,$NDj5A$G$9!#\e(B
+
+\e$B<B:]$K$O\e(B(\e$B%G%U%)%k%H@_Dj$G$O\e(B)\e$B%5%^%jI=<($G\e(B@var{\e$B$"$@L>\e(B}\e$B!"%I%i%U%H:n@.;~$N%"\e(B
+\e$B%I%l%9>pJs$H$7$F\e(B@var{\e$BK\L>\e(B}\e$B$,;H$o$l$^$9!#;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,\e(B
+\e$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\e(B
+\e$BDj5A$r$d$jD>$9$N$,NI$$$G$7$g$&!#\e(B
+
+\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F$$$l$P!"\e(B
+\e$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
+
+\e$B$5$i$K!"JQ?t\e(B @code{wl-use-ldap} (\e$B=i4|@_Dj$O\e(B @code{nil}) \e$B$r\e(B non-nil \e$B$K@_\e(B
+\e$BDj$9$k$H!"\e(BLDAP \e$B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^\e(B
+\e$B$9!#\e(B
+
+LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
+@code{wl-ldap-base} \e$B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"\e(BLDAP \e$BBP1~$N\e(B XEmacs \e$B0J\e(B
+\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B @command{ldapsearch} \e$B$rMxMQ$7$^$9$N$G!"\e(B
+@command{ldapsearch} \e$B$X$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"\e(B
+\e$B$j$^$9!#\e(B
+
+@node Address Manager,  , Mail Addresses, Address Book
+@section \e$B%"%I%l%9%^%M!<%8%c\e(B
+@cindex Address Manager
+
+@kbd{C-c C-a} \e$B$H$9$k$H%"%I%l%9%^%M!<%8%c$r5/F0$5$l$^$9!#%"%I%l%9%^%M!<%8%c\e(B
+\e$B$G$O%"%I%l%9D"$NJT=8$r9T$&$3$H$,=PMh$k$N$K2C$($F!"%"%I%l%9%^%M!<%8%c$G;X\e(B
+\e$BDj$7$?%"%I%l%9$r%I%i%U%H%P%C%U%!$XA^F~$9$k$3$H$,$G$-$^$9!#\e(B
+
+@subsection \e$B%-!<%P%$%s%I\e(B
+
+@table @kbd
+@item t
+@kindex t (Address Manager)
+@findex wl-addrmgr-set-to
+@samp{To:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item c
+@kindex c (Address Manager)
+@findex wl-addrmgr-set-cc
+@samp{Cc:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item b
+@kindex b (Address Manager)
+@findex wl-addrmgr-set-bcc
+@samp{Bcc:} \e$B%^!<%/$r$D$1$^$9!#\e(B
+
+@item u
+@kindex u (Address Manager)
+@findex wl-addrmgr-unmark
+\e$B%^!<%/$r<h$j>C$7$^$9!#\e(B
+
+@item x
+@kindex x (Address Manager)
+@findex wl-addrmgr-apply
+\e$B08@h%^!<%/$,$D$$$F$$$k>l9g!"$=$l$i$N%"%I%l%9$r%I%i%U%H%P%C%U%!$K\e(B
+\e$BH?1G$7$F%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#%I%i%U%H%P%C%U%!$,L5$$>l9g!"\e(B
+\e$B$=$l$i$rH?1G$7$F?75,$K%I%i%U%H%P%C%U%!$r3+$-$^$9!#\e(B
+\e$B08@h%^!<%/$,$D$$$F$$$J$$>l9g$OC1$K%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#\e(B
+
+@item q
+@kindex q (Address Manager)
+@findex wl-addrmgr-quit
+\e$B%"%I%l%9%^%M!<%8%c$r=*N;$7$^$9!#\e(B
+
+@item a
+@kindex a (Address Manager)
+@findex wl-addrmgr-add
+\e$B%"%I%l%9D"$K?7$7$$9`L\$rDI2C$7$^$9!#\e(B
+
+@item d
+@kindex d (Address Manager)
+@findex wl-addrmgr-delete
+\e$B%"%I%l%9D"$N9`L\$r:o=|$7$^$9!#\e(B
+
+@item e
+@kindex e (Address Manager)
+@findex wl-addrmgr-edit
+\e$B%"%I%l%9D"$N9`L\$rJT=8$7$^$9!#\e(B
+@end table
+
+
+@node Customization, Mailing List, Address Book, Top
 @chapter Wanderlust \e$B$N%+%9%?%^%$%:\e(B
 @cindex Customization
 
@@ -5772,9 +5988,11 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 * BBDB::                        BBDB
 * supercite::                   supercite.el
 * mu-cite::                     mu-cite.el
-* x-face-mule::                 x-face-mule.el
+* X-Face::                      x-face,bitmap-mule
 * dired-dd::                    dired-dd.el
 * MHC::                         MHC
+* Addrbook::                    Addrbook
+* mime-w3m::                    mime-w3m.el
 @end menu
 
 
@@ -5792,7 +6010,7 @@ OK \e$B$G$9!#\e(B
 @lisp
 @group
 (autoload 'wl-draft-send-with-imput-async "im-wl")
-(setq wl-draft-send-func 'wl-draft-send-with-imput-async)
+(setq wl-draft-send-function 'wl-draft-send-with-imput-async)
 @end group
 @end lisp
 
@@ -5820,13 +6038,16 @@ OK \e$B$G$9!#\e(B
 (setq signature-use-bbdb t)
 (setq bbdb-north-american-phone-numbers-p nil)
 ;; @r{\e$B%5%^%j$K\e(B bbdb \e$B$NL>A0$rI=<(\e(B} :-)\e$B!#\e(B
-(setq wl-summary-from-func 'bbdb-wl-from-func)
+(setq wl-summary-from-function 'bbdb-wl-from-func)
 ;; @r{\e$B<+F0E*$K\e(B ML \e$B%U%#!<%k%I$r2C$($k\e(B}
 (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook)
 (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0))))
 @end group
 @end lisp
 
+\e$B%I%i%U%H%P%C%U%!$G\e(B @kbd{M-@key{TAB}} \e$B$K$h$j\e(B BBDB \e$B$rMQ$$$?\e(B
+\e$B%"%I%l%9$NJd40$,$G$-$^$9!#\e(B
+
 
 @node supercite, mu-cite, BBDB, Living with other packages
 @subsection sc.el(supercite), sc-register.el
@@ -5848,7 +6069,7 @@ OK \e$B$G$9!#\e(B
 @end lisp
 
 
-@node mu-cite, x-face-mule, supercite, Living with other packages
+@node mu-cite, X-Face, supercite, Living with other packages
 @subsection mu-cite.el
 @pindex mu-cite
 
@@ -5874,56 +6095,72 @@ mu-cite 8.1\e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 @end group
 @end lisp
 
-@node x-face-mule, dired-dd, mu-cite, Living with other packages
-@subsection x-face-mule.el
-@pindex x-face-mule
-@pindex bitmap-mule
+@node X-Face, dired-dd, mu-cite, Living with other packages
+@subsection x-face
+@pindex x-face
 
-x-face-mule \e$B$N%P!<%8%g%s$K$h$C$F@_Dj$,0[$J$j$^$9!#\e(B
+\e$B0J2<$N$$$:$l$+$r%$%s%9%H!<%k$9$k$3$H$G!"\e(B \e$B%a%C%;!<%8%P%C%U%!$N\e(B
+@samp{X-Face:} \e$B%U%#!<%k%I$r%G%3!<%I$7$F!"2hA|$rI=<($9$k$3$H$,$G$-$^$9!#\e(B
 
-x-face-mule 0.19\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@menu
+* x-face-xmas::                       XEmacs \e$B$N>l9g\e(B
+* x-face-mule::                       Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B
+* x-face-e21::                        Emacs 21.x \e$B$N>l9g\e(B
+@end menu
+
+\e$B$^$?!"%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
+(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
+\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
+(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
+
+
+@node x-face-xmas, x-face-mule, X-Face, X-Face
+@subsubsection x-face-xmas (XEmacs \e$B$N>l9g\e(B)
+@pindex x-face-xmas
+
+x-face (@uref{ftp://jpl.org/pub/elisp/}) 1.3.6.13 \e$B0J9_$KIUB0$N\e(B
+@file{x-face-xmas.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule:x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-xmas-wl-display-x-face "x-face")
+(setq wl-highlight-x-face-function 'x-face-xmas-wl-display-x-face)
 @end group
 @end lisp
 
-x-face-mule 0.20 \e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
-\e$B0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-mule, x-face-e21, x-face-xmas, X-Face
+@subsubsection x-face-mule (Emacs 19.34\e$B!"\e(B20.x \e$B$N>l9g\e(B)
+@pindex x-face-mule
+@pindex bitmap-mule
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) 8.0\e$B0J9_$K\e(B
+\e$BIUB0$N\e(B @file{x-face-mule.el} \e$B$r;H$&>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
-      (function
-       (lambda (&optional beg end)
-         (x-face-mule-x-face-decode-message-header))))
-(require 'x-face-mule)
+(autoload 'x-face-decode-message-header "x-face-mule")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
-\e$B$r$*;H$$$K$J$k>l9g$O0J2<$N$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
+@node x-face-e21,  , x-face-mule, X-Face
+@subsubsection x-face-e21 (Emacs 21.x \e$B$N>l9g\e(B)
+@pindex x-face-e21
+
+bitmap-mule (@uref{ftp://ftp.jpl.org/pub/elisp/bitmap/}) \e$B$H\e(B
+@file{x-face-e21.el} (@uref{ftp://jpl.org/pub/elisp/}) \e$B$r;H$&>l9g$O0J2<$N\e(B
+\e$B$h$&$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @lisp
 @group
-(autoload 'x-face-decode-message-header "x-face-mule")
-(setq wl-highlight-x-face-func 'x-face-decode-message-header)
+(require 'bitmap)
+(autoload 'x-face-decode-message-header "x-face-e21")
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
-\e$B%(%s%3!<%I:Q$_$N\e(B X-Face \e$BJ8;zNs$r\e(B @file{~/.xface}
-(\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
-\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5$l$^$9!#\e(B
-(\e$BJQ?t\e(B @code{wl-auto-insert-x-face} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)
 
-
-@node dired-dd, MHC, x-face-mule, Living with other packages
+@node dired-dd, MHC, X-Face, Living with other packages
 @subsection dired-dd(Dired-DragDrop)
 @pindex Dired-DragDrop
 @pindex Dired-DD
@@ -5931,8 +6168,8 @@ bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
 
 dired-dd \e$B%Q%C%1!<%8$K4^$^$l$k\e(B @file{dired-dd-mime.el} \e$B$rAH$_9~$a$P!"\e(BGNU
 Emacs \e$B$GJT=8Cf$NAp9F%P%C%U%!$X\e(B dired \e$B$+$i%I%i%C%0\e(B&\e$B%I%m%C%W$9$k$@$1$G4JC1\e(B
-\e$B$K%^%k%A%Q!<%H$r:n@.$G$-$^$9\e(B(\e$B$b$C$H$b!"\e(BWanderlust \e$B@lMQ$G$O$J$/\e(B tm/SEMI 
-\e$BHFMQ$G$9$,\e(B)\e$B!#\e(B
+\e$B$K%^%k%A%Q!<%H$r:n@.$G$-$^$9\e(B(\e$B$b$C$H$b!"\e(BWanderlust \e$B@lMQ$G$O$J$/\e(B SEMI \e$BHFMQ\e(B
+\e$B$G$9$,\e(B)\e$B!#\e(B
 
 @lisp
 @group
@@ -5949,7 +6186,7 @@ Emacs \e$B$GJT=8Cf$NAp9F%P%C%U%!$X\e(B dired \e$B$+$i%I%i%C%0\e(B&\e$B%I%m%C%W$9$k$@$
 @end group
 @end lisp
 
-@node MHC, , dired-dd, Living with other packages
+@node MHC, Addrbook, dired-dd, Living with other packages
 @subsection mhc.el
 @pindex MHC
 
@@ -5978,6 +6215,34 @@ mhc-current \e$B$N>l9g!'\e(B
 @end group
 @end lisp
 
+@node Addrbook, mime-w3m, MHC, Living with other packages
+@subsection wl-addrbook.el
+@pindex Addrbook
+
+Addrbook of Mew
+(@uref{http://www.mew.org/})
+
+Mew \e$B$N\e(B Addrbook \e$B$r\e(B Wanderlust \e$B$G;HMQ$G$-$k$h$&$K$9$k$K$O!"\e(B
+@file{util/wl-addrbook.el} \e$B$H\e(B @file{util/wl-complete.el} \e$B$r\e(B 
+@code{load-path} \e$B$K$*$$$F!"0J2<$N$h$&$K@_Dj$7$^$9!#\e(B
+
+@lisp
+@group
+(require 'wl-addrbook)
+(wl-addrbook-setup)
+@end group
+@end lisp
+
+@node mime-w3m,  , Addrbook, Living with other packages
+@subsection mime-w3m.el
+@pindex mime-w3m
+
+emacs-w3m (@uref{http://emacs-w3m.namazu.org/}) \e$B$KIUB0$N\e(B
+@file{mime-w3m.el} \e$B$r;H$C$F!"%a%C%;!<%8$N\e(B html \e$B%Q!<%H$r\e(B
+\e$BI=<($5$;$k$3$H$,=PMh$^$9!#@_DjK!$O\e(B @file{mime-w3m.el} \e$B$N\e(B
+\e$B@hF,$N%3%a%s%H$r;2>H$7$F$/$@$5$$!#\e(B
+
+
 @node Highlights, Biff, Living with other packages, Customization
 @section \e$B%O%$%i%$%H$N@_Dj\e(B
 
@@ -6241,13 +6506,12 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @item wl-biff-notify-hook
 @vindex wl-biff-notify-hook
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B?7$7$$%a!<%k$,FO$$$?:]$K<B9T$5$l$k%U%C%/!#\e(B
-\e$BNc$($P%S!<%W2;$rLD$i$9$J$i\e(B
+\e$BCe?.;~$K%S!<%W2;$rLD$i$9!J=i4|@_Dj!K$J$i0J2<$N$h$&$K@_Dj$7$^$9!#\e(B
 @lisp
-(setq wl-biff-notify-hook '(beep))
+(setq wl-biff-notify-hook '(ding))
 @end lisp
-\e$B$N$h$&$K@_Dj$7$^$9!#\e(B
+\e$B2;$rLD$i$7$?$j$7$J$$>l9g$O\e(B @code{nil} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 @end table
 
 
@@ -6356,14 +6620,14 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @samp{X-Mailer:} \e$B%U%#!<%k%I$d\e(B @samp{User-Agent:} \e$B%U%#!<%k%I$K6E$j$?$$$H\e(B
 \e$B$$$&JQ$o$C$??M$O!"J8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F!"JQ?t\e(B 
-@code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
+@code{wl-generate-mailer-string-function} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @samp{User-Agent:} \e$B%U%#!<%k%I$rC;$/$7$?$$$N$G$"$l$P!"0J2<$N@_Dj$r$7$F$/\e(B
 \e$B$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (concat "User-Agent: "
@@ -6376,7 +6640,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @lisp
 @group
 (setq mime-edit-insert-user-agent-field nil)
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (format "X-Mailer: %s" (product-string-1 'wl-version)))))
@@ -6412,7 +6676,7 @@ Non-nil \e$B$J$i$P!"\e(BWanderlust \e$B=*N;;~$K3NG'$r9T$$$^$9!#\e(B
 
 @item wl-interactive-send
 @vindex wl-interactive-send
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
 Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$FNI$$$+$r3NG'$7$^$9!#\e(B
 
 @item wl-folder-sync-range-alist
@@ -6741,6 +7005,7 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
      10/17    expire-hide by \e$B2,ED$5$s!#\e(B
      11/08    2.4.0 stable \e$B%j%j!<%9!#\e(B
 2001  7/04    2.6.0 stable \e$B%j%j!<%9!#\e(B
+      8/21    wl-addrmgr by \e$BKLK\$5$s!#\e(B
 @end example
 
 \e$B>\$7$$JQA+$O\e(B @file{ChangeLog} \e$B$r8fMw$/$@$5$$!#\e(B