Synch to No Gnus 200403080625.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ebcbfab..2d6caf7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (POP before SMTP): Addition.
+
 2004-03-05  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.texi (Spam ELisp Package Sequence of Events): Index.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index fcf732d..c45faae 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -10783,7 +10783,34 @@ ISP \e$B$,\e(B @acronym{POP}-before-@acronym{SMTP} \e$B$NG'>Z$rMW5a$7$F$$$k>l9g$KM-
 \e$B$9!#\e(B@code{smtpmail-send-it} \e$B$G$O$J$/$F!"\e(B@code{message-send-mail-hook} \e$B$r\e(B
 \e$B<B9T$9$k\e(B @code{message-smtpmail-send-it} \e$B$r;H$o$J$1$l$P$J$i$J$$$3$H$H!"\e(B
 @acronym{POP} \e$B@\B3$N$?$a$K\e(B @code{mail-sources} \e$B$NCM$r@5$7$/@_Dj$7$J$1$l\e(B
-\e$B$P$J$i$J$$\e(B (@pxref{Mail Sources}) \e$B$3$H$KCm0U$7$F2<$5$$!#\e(B
+\e$B$P$J$i$J$$$3$H$KCm0U$7$F2<$5$$!#\e(B@xref{Mail Sources}.
+
+\e$B$b$7\e(B @code{mail-sources} \e$B$KFs$D0J>e$N\e(B @acronym{POP} \e$B%a!<%k%5!<%P!<$r@_Dj\e(B
+\e$B$7$F$$$k$J$i$P!"$=$l$i$N0l$D$r\e(B @acronym{POP}-before-@acronym{SMTP} \e$BG'>Z\e(B
+\e$B$K;H$o$l$k\e(B @acronym{POP} \e$B%a!<%k%5!<%P!<$H$7\e(B
+\e$B$F\e(B @code{mail-source-primary-source} \e$B$K@_Dj$9$kI,MW$,$"$k$G$7$g$&!#$=$l\e(B
+\e$B$,Bh0l\e(B @acronym{POP} \e$B%a!<%k%5!<%P!<$J$i$P\e(B (\e$B$9$J$o$A!"<g$K$=$N%5!<%P!<$+\e(B
+\e$B$i%a!<%k$r<hF@$7$F$$$k$J$i$P\e(B)\e$B!"$=$l$r0J2<$N$h$&$K915WE*$K@_Dj$9$k$3$H$,\e(B
+\e$B$G$-$^$9\e(B:
+
+@lisp
+(setq mail-source-primary-source
+      '(pop :server "pop3.mail.server"
+            :password "secret"))
+@end lisp
+
+@noindent
+\e$B$5$b$J$1$l$P!"\e(B@acronym{POP}-before-@acronym{SMTP} \e$BG'>Z$r9T$J$&$H$-$@$1!"\e(B
+\e$B$=$l$r0J2<$N$h$&$KF0E*$KB+G{$7$F2<$5$$\e(B:
+
+@lisp
+(add-hook 'message-send-mail-hook
+          (lambda ()
+            (let ((mail-source-primary-source
+                   '(pop :server "pop3.mail.server"
+                         :password "secret")))
+              mail-source-touch-pop)))
+@end lisp
 
 @node Mail and Post
 @section \e$B%a!<%k$HEj9F\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 03b5d42..a0eff09 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11456,7 +11456,33 @@ does only a @acronym{POP} authentication according to the value of
 Note that you have to use @code{message-smtpmail-send-it} which runs
 @code{message-send-mail-hook} rather than @code{smtpmail-send-it} and
 set the value of @code{mail-sources} for a @acronym{POP} connection
-(@pxref{Mail Sources}) correctly.
+correctly.  @xref{Mail Sources}.
+
+If you have two or more @acronym{POP} mail servers set in
+@code{mail-sources}, you may want to specify one of them to
+@code{mail-source-primary-source} as the @acronym{POP} mail server to be
+used for the @acronym{POP}-before-@acronym{SMTP} authentication.  If it
+is your primary @acronym{POP} mail server (i.e., you are fetching mails
+mainly from that server), you can set it permanently as follows:
+
+@lisp
+(setq mail-source-primary-source
+      '(pop :server "pop3.mail.server"
+            :password "secret"))
+@end lisp
+
+@noindent
+Otherwise, bind it dynamically only when performing the
+@acronym{POP}-before-@acronym{SMTP} authentication as follows:
+
+@lisp
+(add-hook 'message-send-mail-hook
+          (lambda ()
+            (let ((mail-source-primary-source
+                   '(pop :server "pop3.mail.server"
+                         :password "secret")))
+              mail-source-touch-pop)))
+@end lisp
 
 @node Mail and Post
 @section Mail and Post