* Remove outdated description and clarify (Thanks to John Owens)

* Note on wl-draft-self-reply-p

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 38d07b9..c56c108 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5102,19 +5102,19 @@ Non-nil \e$B$G!"\e(B@samp{To:}, @samp{Cc:} \e$B$,\e(B \e$BJQ?t\e(B @code{wl-subscribed
 @vindex wl-smtp-posting-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 SMTP AUTH \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{smtp-authenticate-user} \e$B$r;H$$$^$9!#\e(B
 
 @item wl-smtp-authenticate-type
 @vindex wl-smtp-authenticate-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-SMTP AUTH \e$B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
-@code{nil} \e$B$N$^$^$J$i\e(B @code{smtp-authenticate-type}\e$B$rMxMQ$7$^$9!#\e(B
-@code{smtp-authenticate-type} \e$B$b\e(B @code{nil} \e$B$J$iG'>Z$r9T$$$^$;$s!#\e(B
+SMTP AUTH \e$B$K$h$kG'>Z$r9T$J$&$H$-$NG'>ZJ}<0$rJ8;zNs$G;XDj$7$^$9!#\e(B
+\e$BCM$H$7$F\e(B @code{plain}, @code{cram-md5}, @code{digest-md5}, @code{login}
+\e$B$J$I$,;XDj$G$-$^$9!#\e(B
+@code{nil} \e$B$J$iG'>Z$r9T$$$^$;$s!#\e(B
 
 @item wl-smtp-connection-type
 @vindex wl-smtp-connection-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-SMTP \e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
+SMTP \e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r%7%s%\%k$G;XDj$7$^$9!#\e(B
 @code{nil} \e$B$J$i%G%U%)%k%H$N@\B37?<0$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$rD%$j$^$9!#\e(B
 @code{ssl} \e$B$J$i\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
@@ -8045,7 +8045,11 @@ 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$
 
 \e$B$^$?!"4X?t\e(B(\e$B?F%a%C%;!<%8$N%P%C%U%!$GI>2A$5$l$k\e(B)\e$B$r\e(B @samp{key} \e$B$d\e(B
 @samp{to-list} \e$BEy$NJQ$o$j$KMQ$$$k$3$H$b$G$-$^$9!#\e(B
-\e$BNc$($P\e(B @kbd{C-u a} \e$B$7$?$H$-$K!"\e(B@code{wl-subscribed-mailing-list} \e$B$N\e(B
+
+\e$B<+J,$N=q$$$?%a%C%;!<%8$X$NJV?.$N>l9g$K%^%C%A$5$;$?$$>l9g$K$O\e(B
+@samp{key} \e$B$H$7$F4X?t\e(B @code{wl-draft-self-reply-p} \e$B$r;XDj$7$^$9!#\e(B
+
+@kbd{C-u a} \e$B$7$?$H$-$K!"\e(B@code{wl-subscribed-mailing-list} \e$B$N\e(B
 \e$B%"%I%l%9$,4^$^$l$k%a!<%k$KBP$7$F$O%a!<%j%s%0%j%9%H$K$N$_JV?.$7$?$$>l9g!"\e(B
 \e$B<!$N$h$&$J@_Dj$,$G$-$^$9!#\e(B
 

diff --git a/doc/wl.texi b/doc/wl.texi
index bfc41fd..fc02feb 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -5069,21 +5069,20 @@ If @code{nil}, default SMTP port number (25) is used.
 @item wl-smtp-posting-user
 @vindex wl-smtp-posting-user
 The initial setting is @code{nil}.
-This is the user name for SMTP AUTH authentication.  If @code{nil},
-@code{smtp-authenticate-user} is used.
+This is the user name for SMTP AUTH authentication.
 
 @item wl-smtp-authenticate-type
 @vindex wl-smtp-authenticate-type
 The initial setting is @code{nil}.
-This is the authentication method for SMTP AUTH authentication.  If
-@code{nil}, @code{smtp-authenticate-type} is used.  If
-@code{smtp-authenticate-type} is still @code{nil}, authentication will
-not be carried out.
+This string-valued variable specifies the authentication method for SMTP
+AUTH authentication.  You may specify @code{plain}, @code{cram-md5},
+@code{digest-md5}, @code{login}, etc.  If @code{nil}, authentication
+will not be carried out.
 
 @item wl-smtp-connection-type
 @vindex wl-smtp-connection-type
 The initial setting is @code{nil}.
-This variable specifies how to establish SMTP connections.
+This symbol-valued variable specifies how to establish SMTP connections.
 If @code{nil}, use default connection type.
 If it is @code{starttls}, use STARTTLS (RFC2595).
 If it is @code{ssl}, use SSL.
@@ -8063,9 +8062,14 @@ These are evaluated in order and first matched one is used.
 Moreover, the behavior of @kbd{a} with prefix argument can
 be directed by @code{wl-draft-reply-with-argument-list} as well.
 
+
 By the way, you can use some function (will be evaluated in the parent
 message buffer) in the place of @samp{key} or @samp{to-list} etc.
-For example, if you only want to reply to mailing lists in
+
+If you want to write a rule for replying to message written by yourself,
+specify function @code{wl-draft-self-reply-p} as @samp{key}.
+
+If you only want to reply to mailing lists in
 @code{wl-subscribed-mailing-list} if the parent has some of them,
 set as follows:
 

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index f299a9d..5f20df4 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -583,6 +583,7 @@ If nil, don't authenticate."
   :type '(choice (const :tag "none" nil)
                 (const :tag "PLAIN" "plain")
                 (const :tag "CRAM-MD5" "cram-md5")
+                (const :tag "DIGEST-MD5" "digest-md5")
                 (const :tag "LOGIN" "login")
                 (string :tag "Other"))
   :group 'wl
@@ -870,9 +871,11 @@ cdr of each cons cell is used for preparing headers of draft message.
 Default is for 'reply-to-all'."
   :type '(repeat (cons (choice (string :tag "Field Name")
                               (symbol :tag "Function")
+                              (const :tag "Replying to self" wl-draft-self-reply-p)
                               (repeat :tag "AND"
                                       (choice (string :tag "Field Name")
-                                              (symbol :tag "Function"))))
+                                              (symbol :tag "Function")
+                                              (const :tag "Replying to self" wl-draft-self-reply-p))))
                       (list (repeat :tag "Fields For To" string)
                             (repeat :tag "Fields For Cc" string)
                             (repeat :tag "Fields For Newsgroups" string))))
@@ -887,7 +890,7 @@ Default is for 'reply-to-all'."
     (wl-draft-self-reply-p . (("To") ("Cc") nil))
     ("From" . (("From") ("To" "Cc") nil)))
   "Alist of cons cell of
-\('field-name' .  ('fields for To' 'fields for Cc' 'fields for Newsgroups'))
+\('condition' .  ('fields for To' 'fields for Cc' 'fields for Newsgroups'))
 'condition' is a header name string (non-nil if the header exists in original
 message), a function (evaluated in original message buffer) or a list of those
 \(means 'AND' condition).
@@ -896,9 +899,11 @@ If car of each cons cell returns non-nil value,
 cdr of each cons cell is used for preparing headers of draft message."
   :type '(repeat (cons (choice (string :tag "Field Name")
                               (symbol :tag "Function")
+                              (const :tag "Replying to self" wl-draft-self-reply-p)
                               (repeat :tag "AND"
                                       (choice (string :tag "Field Name")
-                                              (symbol :tag "Function"))))
+                                              (symbol :tag "Function")
+                                              (const :tag "Replying to self" wl-draft-self-reply-p))))
                       (list (repeat :tag "Fields For To" string)
                             (repeat :tag "Fields For Cc" string)
                             (repeat :tag "Fields For Newsgroups" string))))
@@ -2764,6 +2769,7 @@ Handler take two arguments elmo-folder and message number and return string."
   "*Highlight folder with icon(XEmacs or Emacs 21)."
   :type 'boolean
   :group 'wl-highlight)
+
 (defcustom wl-highlight-folder-by-numbers t
   "Highlight folder lines by numbers.
 If it is a number, only numbers will be highlighted."