Added description of new temporary and persistern marks.

(`D', `i', `~', `?', `A' and `&')

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 34dc333..3549116 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -694,8 +694,8 @@ Wanderlust \e$B$O\e(B ELMO \e$B$N%$%s%?%U%'!<%9$rMxMQ$7$F$$$k$?$a!"\e(BELMO \e$B%b%8%
 \e$B%5%]!<%H$7$F$$$l$P!"$I$s$J%U%)%k%@$G$bMxMQ$G$-$^$9!#\e(B
 
 \e$B%P!<%8%g%s\e(B @value{VERSION} \e$B8=:_!"MQ0U$5$l$F$$$k%U%)%k%@$O!"\e(BIMAP, NNTP,
-LocalDir(MH), Maildir, News Spool, Archive, POP, Multi, Filter, Pipe,
-Internal \e$B$N\e(B 11 \e$B<oN`$G$9!#\e(B
+LocalDir(MH), Maildir, News Spool, Archive, POP, Shimbun, Namazu, Multi,
+Filter, Pipe, Internal \e$B$N\e(B 13 \e$B<oN`$G$9!#\e(B
 
 @menu
 * IMAP Folder::              @samp{%} -- IMAP \e$B%U%)%k%@\e(B
@@ -2553,7 +2553,8 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 
 \e$B0l;~E*%^!<%/$O!"%a%C%;!<%8$rA`:n$9$k$?$a%^!<%/$G$9!#\e(B
 
-\e$B0l;~E*%^!<%/$K$O!"\e(B@samp{*}, @samp{d}, @samp{o}, @samp{O} \e$B$,$"$j$^$9!#\e(B
+\e$B0l;~E*%^!<%/$K$O!"\e(B@samp{*}, @samp{d}, @samp{D}, @samp{o}, @samp{O},
+@samp{i}, @samp{~} \e$B$,$"$j$^$9!#\e(B
 
 @table @samp
 @item *
@@ -2564,6 +2565,9 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 @item d
 \e$B=hJ,$9$k%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{d} \e$B$r2!$9$HIU$-$^$9!#\e(B
 
+@item D
+\e$B:o=|$9$k%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{D} \e$B$r2!$9$HIU$-$^$9!#\e(B
+
 @item o
 \e$B%j%U%!%$%k$9$k%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{o}\e$B$r2!$9$H!"%j%U%!%$%k@h\e(B
 \e$B$rJ9$$$FMh$^$9!#$=$l$KEz$($k$H!"%j%U%!%$%k@h$N%U%)%k%@>pJs$,IU$12C$o$j$^$9!#\e(B
@@ -2571,6 +2575,13 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 @item O
 \e$B%3%T!<$9$k%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{O}\e$B$r2!$9$H!"%3%T!<@h$rJ9$$$F\e(B
 \e$BMh$^$9!#$=$l$KEz$($k$H!"%3%T!<@h$N%U%)%k%@>pJs$,IU$12C$o$j$^$9!#\e(B
+
+@item i
+\e$B%W%j%U%'%C%AM=Ls$5$l$?%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{i}\e$B$r2!$9$HIU$-$^$9!#\e(B
+
+@item ~
+\e$B:FAwM=Ls$5$l$?%a%C%;!<%8$KIU$/%^!<%/$G$9!#\e(B@kbd{~}\e$B$r2!$9$H!":FAw@h%"%I%l\e(B
+\e$B%9$rJ9$$$FMh$^$9!#$=$l$KEz$($k$H!":FAw@h$N%"%I%l%9>pJs$,IU$12C$o$j$^$9!#\e(B
 @end table
 
 @kbd{x} \e$B$r2!$9$H!"$=$l$>$l$N0l;~E*%^!<%/$KBP1~$7$?%"%/%7%g%s$r<B9T$7$^$9!#\e(B
@@ -2579,12 +2590,16 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 
 \e$B1JB3E*%^!<%/$O!"%a%C%;!<%8$N>uBV$r<($9%^!<%/$G$9!#\e(B
 
-\e$B1JB3E*%^!<%/$K$O!"\e(B@samp{N}, @samp{U}, @samp{!}, @samp{u}, @samp{$} \e$B$,$"$j$^$9!#\e(B
+\e$B1JB3E*%^!<%/$K$O!"\e(B@samp{N}, @samp{?}, @samp{U}, @samp{!}, @samp{u},
+@samp{A}, @samp{&}, @samp{$} \e$B$,$"$j$^$9!#\e(B
 
 
 @table @samp
 @item N
 \e$B?75,%a%C%;!<%8$KIU$-$^$9!#\e(B
+@item ?
+\e$B?75,%a%C%;!<%8$KIU$-$^$9!#\e(B@samp{N} \e$B$H$O0[$J$j!"\e(B@samp{?} \e$B$N%a%C%;!<%8$O\e(B
+\e$B%-%c%C%7%e$5$l$F$$$^$9!#\e(B
 @item U
 \e$BL$FI%a%C%;!<%8$KIU$-$^$9!#\e(B
 @item !
@@ -2593,6 +2608,11 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 @item u
 \e$B4{FI%a%C%;!<%8$KIU$-$^$9!#%^!<%/L5$7$H$O0[$J$j!"\e(B@samp{u} \e$B$N%a%C%;!<%8$O\e(B
 \e$B%-%c%C%7%e$5$l$F$$$^$;$s!#\e(B
+@item A
+\e$BJV?.:Q$_%a%C%;!<%8$KIU$-$^$9!#\e(B
+@item &
+\e$BJV?.:Q$_%a%C%;!<%8$KIU$-$^$9!#\e(B@samp{A} \e$B$H$O0[$J$j!"\e(B@samp{&} \e$B$N%a%C%;!<%8\e(B
+\e$B$O%-%c%C%7%e$5$l$F$$$^$9!#\e(B
 @item $
 @kbd{$} \e$B%-!<$r2!$9$H!"\e(B@samp{$} \e$B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O\e(B Emacs \e$B$r=*N;\e(B
 \e$B$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=EMW$J\e(B
@@ -2603,11 +2623,11 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 \e$B4{FI%a%C%;!<%8$K$O%^!<%/$,B8:_$7$^$;$s!#\e(B
 @end table
 
-@samp{N}, @samp{U}, @samp{u} \e$B$O!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$J$$\e(B
-\e$B$3$H$r<($7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C\e(B
-\e$B%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"%M%C%H%o!<%/$K@\B3$5$l$F$$$J$/$F$b\e(B
-IMAP \e$B%U%)%k%@$N%a%C%;!<%8$d\e(B NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-\e(B
-\e$B$^$9!#\e(B
+@samp{N}, @samp{U}, @samp{u}, @samp{A} \e$B$O!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5\e(B
+\e$B$l$F$$$J$$$3$H$r<($7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"\e(B
+\e$B$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"%M%C%H%o!<%/$K@\B3$5$l$F$$$J\e(B
+\e$B$/$F$b\e(BIMAP \e$B%U%)%k%@$N%a%C%;!<%8$d\e(B NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H\e(B
+\e$B$,$G$-$^$9!#\e(B
 
 \e$B1JB3E*%^!<%/$N$&$A!"\e(B@code{wl-summary-expire-reserve-marks} \e$B$G;XDj$7$?\e(B
 \e$B%^!<%/$NIU$$$?%a%C%;!<%8$O!"8e$G@bL@$9$k\e(B (Wanderlust \e$B$N5!G=$H$7$F$N\e(B)
@@ -4279,7 +4299,7 @@ Non-nil \e$B$J$i!"@_Dj$5$l$?CM$r%I%i%U%H$N\e(B @samp{Bcc:} \e$B$H$7$F:G=i$+$iA^F~$7
 @end group
 @end example
 
-[\e$B%5%V4X?t\e(B]\e$B$K$O!"%G%U%)%k%H$G0J2<$N\e(B10\e$B8D$rMQ0U$7$F$$$^$9!#\e(B
+[\e$B%5%V4X?t\e(B]\e$B$K$O!"%G%U%)%k%H$G0J2<$N\e(B13\e$B8D$rMQ0U$7$F$$$^$9!#\e(B
 
 @example
 'header:      \e$B%X%C%@$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B

diff --git a/doc/wl.texi b/doc/wl.texi
index aac5096..46d1a67 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -670,9 +670,9 @@ This chapter describes the folder types which Wanderlust is able to handle.
 Wanderlust uses ELMO as it's interface, so you can use every folder types
 supported by ELMO.
 
-As of version @value{VERSION}, 11 types of folders are predefined. These are
-IMAP, NNTP, LocalDir(MH), Maildir, News Spool, Archive, POP, Multi, Filter,
-Pipe and Internal folder types.
+As of version @value{VERSION}, 13 types of folders are predefined. These
+are IMAP, NNTP, LocalDir(MH), Maildir, News Spool, Archive, POP,
+Shimbun, Namazu, Multi, Filter, Pipe and Internal folder types.
 
 @menu
 * IMAP Folder::                 @samp{%} -- IMAP folder
@@ -2542,7 +2542,7 @@ message has empty subject field.
 @cindex Mark, Temporary
 
 There are four temporary marks,
-@samp{*}, @samp{d}, @samp{o} and @samp{O}.
+@samp{*}, @samp{d}, @samp{D}, @samp{o}, @samp{O}, @samp{i} and @samp{~}.
 Temporary marks indicates message operations.
 
 @table @samp
@@ -2554,6 +2554,9 @@ with the key bindings which begins with @kbd{m}.
 @item d
 The mark to dispose. You can put @samp{d} by typing @kbd{d} key.
 
+@item D
+The mark to force delete. You can put @samp{D} by typing @kbd{D} key.
+
 @item o
 The mark to refile.
 After you type @kbd{o} key, prompt appears to input refile destination.
@@ -2564,14 +2567,23 @@ The mark to refile.
 You can put this mark by typing @kbd{O} key.
 The difference between this mark and refile mark is,
 this mark does not delete the message while latter does.
+
+@item i
+The mark to prefetch reserved.
+You can put this mark by typing @kbd{i} key.
+
+@item ~
+The mark to resend reserved.
+After you type @kbd{~} key, prompt appears to input address to resend.
+Your answer is printed in the summary line.
 @end table
 
 @kbd{x} key executes action for temporary marks, respectively.
 
 @subsection Persistent Marks
 
-There are five persistent marks,
-@samp{N}, @samp{U}, @samp{!}, @samp{u} and @samp{$}.
+There are five persistent marks, @samp{N}, @samp{?}, @samp{U}, @samp{!},
+@samp{u}, @samp{A}, @samp{&} and @samp{$}.
 
 The persistent mark indicates the message's status and it is saved.
 Each persistent mark indicates:
@@ -2579,12 +2591,18 @@ Each persistent mark indicates:
 @table @samp
 @item N
 It is new message.
+@item ?
+It is new but cached message.
 @item U
 It is unread message.
 @item !
 It is unread but cached message.
 @item u
 It is read but it is not cached.
+@item A
+It is already replied message.
+@item &
+It is already replied but cached message.
 @item $
 It is important message.  You can put @samp{$} mark by typing @kbd{$}
 key (if already exists, the mark is deleted).  It is convenient to put
@@ -2598,9 +2616,10 @@ If the message is read and cached (or local message),there are no
 persistent mark.
 @end table
 
-@samp{N}, @samp{U} and @samp{u} indicates that the message have no
-cache.  Messages with the marks other than these, you can read them in
-the offline status even they are in the IMAP folder or netnews folder.
+@samp{N}, @samp{U}, @samp{u}, @samp{A} indicates that the message have
+no cache.  Messages with the marks other than these, you can read them
+in the offline status even they are in the IMAP folder or netnews
+folder.
 
 Among messages with persistent marks, ones with marks specified by 
 @code{wl-summary-expire-reserve-marks} are excluded from the expiration
@@ -4297,7 +4316,7 @@ The format of @code{wl-draft-config-alist} is:
 @end group
 @end example
 
-Per default, there are 10 following sub-functions.
+Per default, there are 13 following sub-functions.
 
 @example
 'header:      Inserts the specified string at the bottom of the header.