Remove description of wl-draft-reply-myself-with(out)-argument-list.

Add description of stream type identifier "!direct".
Add format of wl-summary-mark-action-list.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 8e35a6f..f457f2f 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -771,9 +771,12 @@ default \e$BCM\e(B:
 
 \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-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
+\e$B%/%7%g%s$rD%$j$^$9!#\e(B
+
+\e$BJQ?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!#$3$l$i$N>l9g!"DL>o$N@\B3$r$9$k$K$O%U%)%k%@L>$N:G8e$K\e(B
+@samp{!direct} \e$B$rIU$1$^$9!#\e(B
 
 @lisp
 @group
@@ -882,8 +885,10 @@ default \e$BCM\e(B:
 @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-nntp-default-stream-type} \e$B$NCM$,\e(B @code{ssl} \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
+\e$B$3$l$i$N>l9g!"DL>o$N@\B3$r$9$k$K$O%U%)%k%@L>$N:G8e$K\e(B @samp{!direct} \e$B$rIU$1$^$9!#\e(B
 
 \e$BNc\e(B:
 
@@ -1289,8 +1294,11 @@ 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-pop3-default-stream-type} \e$B$NCM$,\e(B @code{ssl} \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
+\e$B$3$l$i$N>l9g!"DL>o$N@\B3$r$9$k$K$O%U%)%k%@L>$N:G8e$K\e(B@samp{!direct} \e$B$rIU$1$^$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
 \e$BI,MW$,$"$j$^$9!#\e(B
@@ -3053,6 +3061,43 @@ Non-nil \e$B$G$"$l$P%U%)%k%@$K0\F0$7$?;~$K:G=i$N%a%C%;!<%8$r<+F0E*$K@hFI$_$7$^$9!
 dispose (@samp{d}), delete (@samp{D}), prefetch (@samp{i}), resend (@samp{~})
 \e$B$,Dj5A$5$l$F$$$^$9!#\e(B
 
+@code{wl-summary-mark-action-list} \e$B$N3FMWAG$O\e(B
+
+@example
+(@samp{MARK} @samp{SYMBOL}
+ @samp{ARGUMENT-FUNCTION} @samp{SET-MARK-FUNCTION} @samp{EXEC-FUNCTION}
+ @samp{FACE} @samp{DOC-STRING})
+@end example
+
+\e$B$NAH$G$9!#$3$3$G\e(B @samp{MARK} \e$B$ODj5A$9$k0l;~%^!<%/$NJ8;zNs$G!"\e(B
+@samp{SYMBOL} \e$B$ODj5A$9$k%"%/%7%g%s$NL>A0$G$9!#\e(B
+@samp{ARGUMENT-FUNCTION} \e$B$O<!$K@bL@$9$k\e(B @samp{SET-MARK-FUNCTION} \e$B$K\e(B
+\e$BM?$($k0z?t$r@_Dj$9$k$?$a$N4X?t$G!"$=$N0z?t$H$7$F$O\e(B
+
+@example
+(@samp{ACTION} @samp{NUMBER})
+@end example
+
+\e$B$,M?$($i$l$^$9!#\e(B@samp{ACTION} \e$B$K$O\e(B @samp{SYMBOL} \e$B$HF1$8$b$N$,F~$j!"\e(B
+@samp{NUMBER} \e$B$K$O%a%C%;!<%8HV9f$,F~$j$^$9!#\e(B
+@samp{SET-MARK-FUNCTION} \e$B$O%^!<%/$r@_Dj$9$k:]$K8F$P$l$k4X?t$G!"0z?t$O\e(B
+
+@example
+(@samp{NUMBER} @samp{MARK} @samp{DATA})
+@end example
+
+\e$B$G$9!#\e(B@samp{NUMBER} \e$B$OBP>]$H$J$k%a%C%;!<%8$NHV9f!"\e(B@samp{MARK} \e$B$O0l;~%^!<\e(B
+\e$B%/$NJ8;zNs!"\e(B@samp{DATA} \e$B$O\e(B @samp{ARGUMENT-FUNCTION} \e$B$GM?$($i$l$k$b$N$G$9!#\e(B
+
+@samp{EXEC-FUNCTION} \e$B$O%"%/%7%g%s$r<B9T$9$k:]$K8F$P$l$k4X?t$G!"$=$N0z?t$O\e(B
+@samp{MARK-INFO} \e$B$+$i$J$k%j%9%H$G$9!#$3$3$G\e(B @samp{MARK-INFO} \e$B$O\e(B
+
+@example
+(@samp{NUMBER} @samp{MARK} @samp{DATA})
+@end example
+
+\e$B$+$i$J$k%j%9%H$G$9!#\e(B@samp{FACE} \e$B$O%O%$%i%$%H$KMQ$$$k\e(B face \e$B$G$9!#\e(B
+
 
 @node Key Bindings of Summary, Variables of Summary, Mark and Action, Summary
 @section \e$B%-!<%P%$%s%I\e(B
@@ -7938,8 +7983,6 @@ 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$
 @subsection \e$BJV;vMQ%I%i%U%H\e(B
 @vindex wl-draft-reply-with-argument-list
 @vindex wl-draft-reply-without-argument-list
-@vindex wl-draft-reply-myself-with-argument-list
-@vindex wl-draft-reply-myself-without-argument-list
 
 \e$B%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$9$HJV;vMQ$N%I%i%U%H$,MQ0U$5$l$^$9!#\e(B
 \e$BMQ0U$5$l$kAp9F$N08@h$O!"0J2<$N$h$&$K$7$F@_Dj$9$k$3$H$,$G$-$^$9!#\e(B
@@ -8030,12 +8073,6 @@ 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$
 @end lisp
 
 
-\e$BCm!'\e(B \e$B<+J,$,=P$7$?%a!<%k$KJV?.$9$k:]$NF0:n$O!"$=$l$i$KBe$o$C$F\e(B
-@code{wl-draft-reply-myself-without-argument-list},
-@code{wl-draft-reply-myself-with-argument-list}
-\e$B$G;XDj$7$^$9!#\e(B
-
-
 @node Thread Format, User-Agent Field, Draft for Reply, Advanced Settings
 @subsection \e$B%9%l%C%I$N8+$?$a\e(B
 

diff --git a/doc/wl.texi b/doc/wl.texi
index ff871bb..57fd60e 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -746,11 +746,14 @@ if you have to go through a firewall.
 @end lisp
 
 SSL (Secure Socket Layer) connection will be used if a folder name ends
-with @samp{!}. Or, if the value of @code{elmo-imap4-default-stream-type}
-is @code{ssl}, SSL will be the default connection.  If a folder name
-ends with @samp{!!}, STARTTLS connection will be established.  If the
-value of @code{elmo-imap4-default-stream-type} is @code{starttls},
-STARTTLS will be the default connection.
+with @samp{!}.  If a folder name ends with @samp{!!}, STARTTLS
+connection will be established.
+
+If the value of @code{elmo-imap4-default-stream-type} is @code{ssl},
+SSL will be the default connection, i.e. you can omit @samp{!}.  If it
+is is @code{starttls}, STARTTLS will be the default connection.  To use
+normal connection in these cases, add @samp{!direct} at the end of
+folder name.
 
 @lisp
 @group
@@ -849,12 +852,15 @@ default:
 @end example
 
 AUTHINFO is used as authentication method if the @var{username} is
-non-nil.  SSL will be default method if
-@code{elmo-nntp-default-stream-type} is @code{ssl} even if the folder name
-doesn't end with @samp{!}.  If a folder name ends with @samp{!!},
-STARTTLS connection will be established.  if the value of
-@code{elmo-nntp-default-stream-type} is @code{starttls}, STARTTLS will
-be the default connection.
+non-nil.  SSL connection will be used if a folder name ends with @samp{!}.
+If a folder name ends with @samp{!!}, STARTTLS connection will be
+established.
+
+If the value of @code{elmo-nntp-default-stream-type} is @code{ssl},
+SSL will be the default connection, i.e. you can omit @samp{!}.  If it
+is is @code{starttls}, STARTTLS will be the default connection.  To use
+normal connection in these cases, add @samp{!direct} at the end of
+folder name.
 
 Example:
 
@@ -1264,12 +1270,14 @@ To use apop as an @var{authenticate-type}, @file{md5.el} is needed
 (GPL2).
 
 If the last character of the folder name is @samp{!}, Wanderlust
-connects to the POP server via SSL (Secure Socket Layer).  If you set
-@code{ssl} to @code{elmo-pop3-default-stream-type}, you don't have to put
-@samp{!} in the end of the folder name to use SSL. If a folder name ends
-with @samp{!!}, STARTTLS connection will be established.  if the value
-of @code{elmo-pop3-default-stream-type} is @code{starttls}, STARTTLS will be the
-default connection.
+connects to the POP server via SSL (Secure Socket Layer).  If a folder
+name ends with @samp{!!}, STARTTLS connection will be established.
+
+If the value of @code{elmo-pop3-default-stream-type} is @code{ssl},
+SSL will be the default connection, i.e. you can omit @samp{!}.  If it
+is is @code{starttls}, STARTTLS will be the default connection.  To use
+normal connection in these cases, add @samp{!direct} at the end of
+folder name.
 
 
 @node Shimbun Folder, Namazu Folder, POP Folder, Folders
@@ -3034,6 +3042,44 @@ You can define temporary marks and corresponding procedure by
 (@samp{O}), dispose (@samp{d}), delete (@samp{D}), prefetch (@samp{i})
 and resend (@samp{~}) are defined.
 
+Each element of @code{wl-summary-mark-action-list} consists of
+
+@example
+(@samp{MARK} @samp{SYMBOL}
+ @samp{ARGUMENT-FUNCTION} @samp{SET-MARK-FUNCTION} @samp{EXEC-FUNCTION}
+ @samp{FACE} @samp{DOC-STRING})
+@end example
+
+@samp{MARK} is a temporary mark string, and @samp{SYMBOL} is the name of
+the action to be defined.  @samp{ARGUMENT-FUNCTION} is a function to
+generate argument to be given to @samp{SET-MARK-FUNCTION}, which will be
+described next, and it takes arguments:
+
+@example
+(@samp{ACTION} @samp{NUMBER})
+@end example
+
+Where @samp{ACTION} equals to @samp{SYMBOL}, and @samp{NUMBER} is message
+number.  @samp{SET-MARK-FUNCTION} is a function to be called when the mark
+is put. It takes arguments:
+
+@example
+(@samp{NUMBER} @samp{MARK} @samp{DATA})
+@end example
+
+Where @samp{NUMBER} is target message number, @samp{MARK} is a temporary
+mark string, and @samp{DATA} is given by @samp{ARGUMENT-FUNCTION}.
+
+@samp{EXEC-FUNCTION} is a function to be called when the action is
+executed. Its argument is a list of @samp{MARK-INFO}.  Here @samp{MARK-INFO}
+means a list consists of
+
+@example
+(@samp{NUMBER} @samp{MARK} @samp{DATA})
+@end example
+
+@samp{FACE} is a face to be used for highlighting.
+
 
 @node Key Bindings of Summary, Variables of Summary, Mark and Action, Summary
 @section Key bindings
@@ -7957,8 +8003,6 @@ For silence, set to @code{nil}.
 @subsection Draft for Replay
 @vindex wl-draft-reply-with-argument-list
 @vindex wl-draft-reply-without-argument-list
-@vindex wl-draft-reply-myself-with-argument-list
-@vindex wl-draft-reply-myself-without-argument-list
 
 If you type @kbd{a} in the Summary Buffer, a draft for reply is prepared.
 The addressee for the draft is decided by following rules.
@@ -8049,10 +8093,6 @@ set as follows:
 @end lisp
 
 
-Note: To set the behavior when you reply to the message written by yourself,
-use @code{wl-draft-reply-myself-without-argument-list} and
-@code{wl-draft-reply-myself-with-argument-list} instead of them.
-
 @node Thread Format, User-Agent Field, Draft for Reply, Advanced Settings
 @subsection Appearance of Threads