Synch with No Gnus (201102112016).

diff --git a/auth-ja.texi b/auth-ja.texi
index ab94029..5616981 100644 (file)
--- a/auth-ja.texi
+++ b/auth-ja.texi
@@ -5,7 +5,7 @@
 @setfilename auth-ja
 @settitle Emacs auth-source Library @value{VERSION}
 
-@set VERSION 0.2
+@set VERSION 0.3
 
 @copying
 \e$B$3$N%U%!%$%k$O\e(B Emacs auth-source \e$B%i%$%V%i%j!<$r@bL@$7$^$9!#\e(B
@@ -93,15 +93,19 @@ license to the document, as described in section 6 of the license.
 @node Overview
 @chapter \e$B35MW\e(B
 
-auth-source \e$B%i%$%V%i%j!<$O!"!V%5!<%P!<L>$H%]!<%H$O$o$+$C$F$k$s$@$1$I!"%f!<\e(B
-\e$B%6!<L>$H%Q%9%o!<%I$O2?$@$C$1\e(B?\e$B!W$H$$$&@N$J$,$i$NG.Nu$JLd$$$KEz$($k$?$a$N!"\e(B
-Emacs \e$B$H\e(B Gnus \e$BMQ$N?t$"$kC1=c$J<jCJ$N0l$D$G$9!#\e(B
+auth-source \e$B%i%$%V%i%j!<$O!"!V;d$N%f!<%6!<L>$H%Q%9%o!<%I$O2?$@$C$1\e(B?\e$B!W$H\e(B
+\e$B$$$&@N$J$,$i$NG.Nu$JLd$$$KEz$($k$?$a$N!"\e(BEmacs \e$B$H\e(B Gnus \e$BMQ$N?t$"$kC1=c$J<j\e(B
+\e$BCJ$N0l$D$G$9!#\e(B
 
-\e$B<B:]$K$O\e(B auth-source \e$B%i%$%V%i%j!<$OC1$J$k%f!<%6!<L>\e(B (\e$B$$$o$f$k\e(B login) \e$B$d\e(B
-\e$B%Q%9%o!<%I0J30$N$b$N$b07$&$3$H$,$G$-$^$9$,!":#F|$N\e(B Emacs \e$B$H\e(B Gnus \e$B$G$O$=\e(B
-\e$B$l$i\e(B 2\e$B$D$@$1$,;H$o$l$F$$$^$9!#F1MM$K\e(B auth-source \e$B%i%$%V%i%j!<$OB?$/$N5-\e(B
-\e$BO?7A<0!"8=:_$OEAE}E*$J\e(B ``netrc'' \e$B7A<0\e(B (\e$B$3$NJ8=q$N8e$NJ}$K$"$j$^$9\e(B) \e$B$^$?\e(B
-\e$B$O%7!<%/%l%C%H%5!<%S%9\e(B API \e$B$r%5%]!<%H$7$^$9!#\e(B
+(\e$B$3$l$O2P;v$N$H$-$N!V>C2P4o$O$I$3$@\e(B?\e$B!W$H$$$&8E$/$+$i$NLd$$$H$O0[$J$j$^$9!#\e(B)
+
+Auth-source \e$B%i%$%V%i%j!<$OC1$J$k%f!<%6!<L>$d%Q%9%o!<%I\e(B (\e$B$$$o$f$kHkL)\e(B) \e$B0J\e(B
+\e$B30$N$b$N$b07$&$3$H$,$G$-$^$9!#\e(B
+
+\e$BF1MM$K\e(B auth-source \e$B%i%$%V%i%j!<$OB?$/$NCyB"%P%C%/%(%s%I!"8=:_$OEAE}E*\e(B
+\e$B$J\e(B ``netrc'' \e$B%P%/%(%s%I\e(B (\e$B$3$NJ8=q$N8e$NJ}$K$"$j$^$9\e(B) \e$B$^$?$O%7!<%/%l%C%H\e(B
+\e$B%5!<%S%9\e(B API \e$B$r%5%]!<%H$7$^$9!#$3$l$O\e(B EIEIO \e$B$K4p$E$$$?%P%/%(%s%I$G9T$J$o\e(B
+\e$B$l!"$b$7I,MW$J$i$"$J$?FH<+$N$b$N$r=q$/$3$H$,$G$-$^$9!#\e(B
 
 @node Help for users
 @chapter \e$BMxMQ<T$N$?$a$N%X%k%W\e(B
@@ -111,24 +115,39 @@ Emacs \e$B$H\e(B Gnus \e$BMQ$N?t$"$kC1=c$J<jCJ$N0l$D$G$9!#\e(B
 machine @var{mymachine} login @var{myloginname} password @var{mypassword} port @var{myport}
 @end example
 
-machine \e$B$O%5!<%P!<$G$9\e(B (DNS \e$BL>$^$?$O\e(B IP \e$B%"%I%l%9\e(B)\e$B!#\e(B
+@code{machine} \e$B$O%5!<%P!<$G$9\e(B (DNS \e$BL>$^$?$O\e(B IP \e$B%"%I%l%9$N$I$A$i$+\e(B)\e$B!#\e(B
+@code{auth-source-search} \e$B8!:w$K$*$1$k\e(B @var{:host} \e$B$G$b$"$j$^$9!#\e(B
+@code{host} \e$B$b;H$&$3$H$,$G$-$^$9!#\e(B
+
+@code{port} \e$B$O@\B3$9$k%]!<%H$^$?$O%W%m%H%3%k$G$9!#\e(B
+@code{auth-source-search} \e$B8!:w$K$*$1$k\e(B @var{:port} \e$B$G$b$"$j$^$9!#\e(B
+@code{protocol} \e$B$b;H$&$3$H$,$G$-$^$9!#\e(B
+
+@code{user} \e$B$O%f!<%6!<L>$G$9!#\e(B@code{auth-source-search} \e$B8!:w$K$*$1\e(B
+\e$B$k\e(B @var{:user} \e$B$G$b$"$j$^$9!#\e(B@code{login} \e$B$*$h$S\e(B @code{account} \e$B$b;H$&$3\e(B
+\e$B$H$,$G$-$^$9!#\e(B
 
-\e$B%]!<%H$N;XDj$OL5$/$F$b9=$$$^$;$s!#L5$$>l9g!"\e(Bauth-source \e$B$O$I$s$J%]!<%H\e(B
-\e$B$b\e(B OK \e$B$J$N$@$H2r<a$7$^$9!#<B:]$N$H$3$m!"%]!<%H$O%W%m%H%3%k$NL>A0$+%]!<%H\e(B
-\e$BHV9f$N$I$A$i$G$bNI$$$N$G!"$b$7$=$&$7$?$$$N$J$i$P!"%]!<%H\e(B @var{143} \e$B$H%W\e(B
-\e$B%m%H%3%k\e(B @code{imap} \e$B$N$?$a$N9`L\$rJL!9$K;}$D$3$H$,$G$-$^$9!#$H$b$"$l!"\e(B
-\e$B$b$7%]!<%H$N;XDj$,MW$i$J$$>l9g$O>JN,$7$F$b9=$$$^$;$s!#\e(B
+\e$B6uGrJ8;z$O\e(B auth-source \e$B$K4X$7$F$O>o$K\e(B OK \e$B$G$9\e(B (\e$BB>$N%W%m%0%i%`$K$ONI$/$J\e(B
+\e$B$$$+$b$7$l$^$;$s$,\e(B)\e$B!#%G!<%?$O0zMQId$G0O$s$G$/$@$5$$!#%G!<%?Cf$N0zMQId$O\e(B
+\e$B$"$J$?$NM=A[DL$j\e(B @code{\} \e$B$G%(%9%1!<%W$7$F$/$@$5$$!#\e(B
 
-login \e$B$H\e(B password \e$B$O!"%5!<%P!<$KBP$7$F4J7i$K$"$J$?$N%m%0%$%s;q3J$r>ZL@$9\e(B
-\e$B$k$?$a$N$b$N$G$9!#\e(B
+\e$B$9$Y$F$3$l$i$OG$0U$G$9!#$I$3$G$bF1$8%Q%9%o!<%I$r;H$&$?$a$K!"$?$@C1$K\e(B
+
+@example
+password @var{mypassword}
+@end example
+
+\e$B$H@_Dj$9$k$3$H$,$G$-$^$9\e(B---\e$B$H$$$&$3$H$,2DG=$G$"$k$3$H$r<($7$F$$$k$N$G$"$C\e(B
+\e$B$F!"$=$l$r?d>)$7$F$$$k$o$1$G$O$"$j$^$;$s!#7+$jJV$7$^$9$,\e(B @emph{\e$B$3$l$O;H\e(B
+\e$B$o$J$$$G$/$@$5$$\e(B}\e$B!#$5$b$J$$$H$R$I$$L\$K2q$&$G$7$g$&!#\e(B
 
 ``Netrc'' \e$B%U%!%$%k$ODL>o\e(B @code{.authinfo} \e$B$^$?$O\e(B @code{.netrc} \e$B$H8F$P$l\e(B
 \e$B$^$9!#:#$G$O\e(B @code{.authinfo} \e$B$NJ}$,Ia5Z$7$F$$$k$h$&$J$N$G!"8e$G$o$+$k$h\e(B
 \e$B$&$K\e(B auth-source \e$B%i%$%V%i%j!<$O$=$l$r%G%#%U%)%k%H$K$9$k$3$H$K$h$C$F!"$3\e(B
 \e$B$N:.Mp$r=uD9$7$F$$$^$9!#\e(B
 
-\e$B$b$7%]!<%H$GLdBj$,$"$k$N$J$i\e(B @code{auth-source-debug} \e$B$r\e(B @code{t} \e$B$K@_Dj\e(B
-\e$B$7$F!"%i%$%V%i%j!<$,$I$N%]!<%H$r%A%'%C%/$7$F$$$k$+\e(B
+\e$B$b$78!:w$GLdBj$,$"$k$N$J$i\e(B @code{auth-source-debug} \e$B$r\e(B @code{t} \e$B$K@_Dj$7\e(B
+\e$B$F!"%i%$%V%i%j!<$,$I$N%[%9%H!"%]!<%H$*$h$S%f!<%6!<$r%A%'%C%/$7$F$$$k$+\e(B
 \e$B$r\e(B @code{*Messages*} \e$B%P%C%U%!!<$G8+$F$/$@$5$$!#F1MM$KB>$N$I$s$JLdBj$K$D\e(B
 \e$B$$$F$b!"2?$,%A%'%C%/$5$l$F$$$k$+$rD4$Y$k$N$,!"$"$J$?$NBh0lJb$G$9!#BhFs$N\e(B
 \e$B%9%F%C%W$O$b$A$m$s$=$l$K$D$$$F$N\e(B blog \e$B$r=q$$$F!"%3%a%s%H$G2sEz$rBT$D$3$H\e(B
@@ -154,49 +173,26 @@ login \e$B$H\e(B password \e$B$O!"%5!<%P!<$KBP$7$F4J7i$K$"$J$?$N%m%0%$%s;q3J$r>ZL@$
 (setq auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)))
 ;;; \e$B$[$\Ey2A$@$,!"$h$jC;$$\e(B (\e$B8e=R$N\e(B fallback \e$B$K$D$$$F$N5-=R$r;2>H\e(B)\e$B!#\e(B
 (setq auth-sources '((:source "~/.authinfo.gpg")))
+;;; \e$B$5$i$KC;$$\e(B @emph{\e$B%G%#%U%)%k%H\e(B}:
+(setq auth-sources '("~/.authinfo.gpg" "~/.authinfo"))
+;;; \e$B%7!<%/%l%C%H\e(B API \e$B$N\e(B @var{login} \e$B%3%l%/%7%g%s$r;H$&\e(B
+;;; (@pxref{Secret Service API})
+(setq auth-sources '("secrets:login"))
 @end lisp
 
-\e$B$3$l$O!V$I$s$J%[%9%H$N$I$N%]!<%H$G$b!"$3$NC10l$N%U%!%$%k$r;H$&!W$H$$$&0U\e(B
-\e$BL#$G$9!#AG@2$i$7$/4JC1$G$7$g$&!#<B:]$K$O8e<T$,$9$G$K%G%#%U%)%k%H$K$J$C$F\e(B
-\e$B$$$k$N$G!"$=$N%U%!%$%k$,$"$l$P!"$3$l$O5!G=$7$^$9!#$=$l$,$"$k$3$H$r3N$+$a\e(B
-\e$B$F$/$@$5$$!#\e(B
-
 \e$BFCDj$N%[%9%H$+%W%m%H%3%k$N%(%s%H%j!<$rJ#?t\e(B @code{auth-sources} \e$B$KDI2C$9\e(B
 \e$B$k$3$H$K$h$C$F!"$=$N%[%9%H$+%W%m%H%3%k$KFC2=$7$?\e(B netrc \e$B%U%!%$%k$r;}$D$3\e(B
 \e$B$H$,$G$-$^$9!#IaDL$3$l$OI,MW$"$j$^$;$s$,!"\e(Bnetrc \e$B%U%!%$%k$r6&M-$7$?$jJQ$o$C\e(B
 \e$B$?@_Dj$,$"$k>l9g$O0UL#$,$"$k$+$b$7$l$^$;$s\e(B (90% \e$B$N\e(B Emacs \e$B%f!<%6!<$OJQ$J\e(B
 \e$B@_Dj$r;}$C$F$$$F!";D$j$N\e(B 10% \e$B$O\e(B @emph{\e$BK\Ev$K\e(B} \e$BJQ$o$C$F$$$^$9\e(B)\e$B!#\e(B
 
-\e$B$3$l$O!"$9$Y$F$N;2>H$K%7!<%/%l%C%H%5!<%S%9\e(B API \e$B$r;H$&Nc$G$9!#%G%U%)%k%H\e(B
-\e$B$N<}=8J*$r;H$$$^$9\e(B:
-
-@lisp
-(setq auth-sources '((:source (:secrets default))))
-@end lisp
-
-\e$B$=$7$F$3$l$O!":.:_$9$k\e(B 2\e$B$D$N%=!<%9$r;H$&Nc$G$9\e(B:
+\e$B$3$l$O!":.:_$9$k\e(B 2\e$B$D$N%=!<%9$r;H$&Nc$G$9\e(B:
 
 @lisp
 (setq auth-sources '((:source (:secrets default) :host "myserver" :user "joe")
-                     (:source "~/.authinfo.gpg")))
+                     "~/.authinfo.gpg"))
 @end lisp
 
-\e$B:GA1$N9gCW$O!"=i2s$NAv::$@$1$G\e(B (\e$B2<$+$i;O$^$k\e(B) \e$B=g=x$K$h$C$F7hDj$5$l$^\e(B
-\e$B$9\e(B (\e$B3FMWAG$O87L)$K>H9g$5$l$^$9\e(B)\e$B!#>e$NNc$G$O!"=i2s$NAv::$G%[%9\e(B
-\e$B%H\e(B @code{myserver} \e$B$X$NC10l$N9gCW$r8+$D$1$k$G$7$g$&!#\e(BNetrc \e$BA*Br$G$O!"$=\e(B
-\e$B$l$,$I$s$J%[%9%H$d%W%m%H%3%k$K$b0E$K\e(B (@emph{fallback} \e$B$H$7$F\e(B) \e$B9gCW$7$F$7\e(B
-\e$B$^$&$N$G!"<:GT$9$k$G$7$g$&!#\e(B@code{auth-sources} \e$B$K$*$1\e(B
-\e$B$k\e(B @code{:host t} \e$B$N@_DjCM$O!"\e(B@code{:host} \e$B$,L5$$>l9g$H0c$C$F!"=i2s$NAv\e(B
-\e$B::$K$*$1$k9gCW$rL\O@$s$@$b$N$G$"$k$H9MN8$5$l$^$9!#\e(B
-
-\e$B$5$F!"$b$7\e(B ``\e$BL$@_Dj\e(B'' \e$B$N%[%9%H$rC5$=$&$H$9$k$H!"$=$l$O$I$s$J%=!<%9$K$bL@\e(B
-\e$B$i$+$J9gCW$O$7$J$$$G$7$g$&!#\e(B2\e$B2sL\$NAv::\e(B (@emph{fallback} \e$B%Q%9\e(B) \e$B$G$O!"$9\e(B
-\e$B$Y$F$N0EL[$N9gCW$rD4$Y$F!"$=$l$i$r<}=8$7$^$9!#$=$l$i$O%9%3%"IU$1$5$l!"%9\e(B
-\e$B%3%"$K$h$C$FJB$YJQ$($i$l$^$9!#%9%3%"$O!"9gCW$9$kL@<(E*$J%Q%i%a!<%?!<$N?t\e(B
-\e$BCM$K4p$E$$$F$$$^$9!#>\:Y$O\e(B @code{auth-pick} \e$B4X?t$r;2>H$7$F$/$@$5$$!#\e(B
-
-\e$BLuCm\e(B fallback: \e$B$"$kMWAG$,;XDj$5$l$F$$$J$$$?$a$K87L)$J9gCW$,5/$3$i$J$/$F\e(B
-\e$B$b!"$"$k5,B'$K$h$C$FA*Br$9$kL\E*J*!"$"$k$$$OA*Br$9$k$3$H!#\e(B
 @end defvar
 
 \e$B$b$7\e(B @code{auth-sources} \e$B$r%+%9%?%^%$%:$7$J$$$H!"%G%#%U%)%k%H$G@83h$9$k\e(B
@@ -205,7 +201,10 @@ login \e$B$H\e(B password \e$B$O!"%5!<%P!<$KBP$7$F4J7i$K$"$J$?$N%m%0%$%s;q3J$r>ZL@$
 \e$B$O\e(B GnuPG \e$B$G0E9f2=$5$l$?%U%!%$%k$G$9\e(B (@pxref{GnuPG and EasyPG Assistant
 Configuration})\e$B!#\e(B
 
-\e$B<B:]$K;H$($k:G$b4JC1$J\e(B netrc \e$B9T$NNc$O!"%]!<%H$,L5$$$b$N$G$9!#\e(B
+\e$B$b$7$=$NFI$_9~$_$K<:GT$9$k$H!"0E9f2=$5$l$F$$$J$$\e(B netrc \e$B%U%!%$\e(B
+\e$B%k\e(B @code{~/.authinfo} \e$B$,;H$o$l$^$9!#\e(B
+
+\e$BBeI=E*$J\e(B netrc \e$B9T$NNc$O!"%]!<%H$,L5$$$b$N$G$9!#\e(B
 
 @example
 machine YOURMACHINE login YOU password YOURPASSWORD
@@ -250,39 +249,30 @@ TODO: \e$B$I$&F/$/$+$r0lHLE*$K!"\e(Bsecrets.el \e$B$O$I$&$d$k$+!"$$$/$D$+$NNc!#\e(B
 @node Help for developers
 @chapter \e$B3+H/<T$N$?$a$N%X%k%W\e(B
 
-auth-source \e$B%i%$%V%i%j!<$K$O!"30It$G;H$&$?$a$N4X?t$O0l$D$7$+$"$j$^$;$s!#\e(B
+auth-source \e$B%i%$%V%i%j!<$K$O!"30It$G;H$&$?$a$N4X?t$O>/$7$7$+$"$j$^$;$s!#\e(B
 
-@defun auth-source-user-or-password mode host port &optional username
-\e$B%[%9%H\e(B @var{host} \e$B$*$h$S%]!<%H\e(B @var{port} \e$B$N$?$a$N\e(B @var{mode} \e$B$G7h$^$kE,\e(B
-\e$B@Z$JG'>Z%H!<%/%s$r<h$j9~$_$^$9!#$b$7\e(B @var{username} \e$B$,M?$($i$l$l$P!"F1MM\e(B
-\e$B$K>H9g$5$l$^$9!#\e(B@code{auth-source-debug} \e$B$,\e(B @code{t} \e$B$@$C$?$i%G%P%C%0$N\e(B
-\e$B$?$a$N%a%C%;!<%8$rI=<($7$^$9!#%m%0$r:N$k$?$a$N4X?t$r;H$&$K$O!"\e(B
-@code{auth-source-debug} \e$B$r$=$N4X?t$K@_Dj$7$F$/$@$5$$!#EO$5$l$k%Q%i%a!<\e(B
-\e$B%?!<$O\e(B @code{message} \e$B4X?t$,<u$1<h$k$b$N$HF1$8$G$9!#$D$^$jMM<0;HMQ$NJ8;z\e(B
-\e$BNs$HG$0U$N%Q%i%a!<%?!<$G$9!#\e(B
+@defun auth-source-search SPEC
 
-\e$B$b$7\e(B @var{mode} \e$B$,J8;zNs$N%j%9%H$J$i$P!"4X?t$OJ8;zNs$N%j%9%H\e(B
-\e$B$+\e(B @code{nil} \e$B$rJV$7$^$9\e(B (\e$B$=$N$?$a!"$b$&\e(B 1\e$B2s\e(B netrc \e$B%U%!%$%k$r2r@O$;$:$K!"\e(B
-\e$B$^$?$O%7!<%/%l%C%H%5!<%S%9\e(B API \e$B$r>H9g$;$:$K:Q$_$^$9\e(B)\e$B!#:#$N$H$3\e(B
-\e$B$m\e(B ``login'' \e$B$H\e(B ``password'' \e$B$@$1$,G'$a$i$l$F$$$^$9$,!">-Mh$O$b$C$HB?$/\e(B
-\e$B$N$b$N$,DI2C$5$l$k$G$7$g$&!#\e(B
+TODO: \e$B$I$&$d$C$F\e(B docstring \e$B$r4^$a$k\e(B?
 
-@var{host} \e$B$O%[%9%HL>$NJ8;zNs$G$9!#\e(B
+@end defun
 
-@var{port} \e$B$O%W%m%H%3%kL>\e(B (\e$BNc$($P\e(B ``imap'') \e$B$^$?$O%]!<%HHV9f$G$9!#%f!<%6!<\e(B
-\e$B$N\e(B netrc \e$B%U%!%$%k$K$"$k%]!<%H$KBP1~$9$kJ8;zNs$G$J$1$l$P$J$j$^$;$s!#\e(B
+@defun auth-source-delete SPEC
 
-@var{username} \e$B$O%f!<%6!<L>$NJ8;zNs\e(B (\e$BNc$($P\e(B ``joe'') \e$B$G$9!#\e(B
+TODO: \e$B$I$&$d$C$F\e(B docstring \e$B$r4^$a$k\e(B?
+
+@end defun
+
+@defun auth-source-forget SPEC
+
+TODO: \e$B$I$&$d$C$F\e(B docstring \e$B$r4^$a$k\e(B?
+
+@end defun
+
+@defun auth-source-forget+ SPEC
+
+TODO: \e$B$I$&$d$C$F\e(B docstring \e$B$r4^$a$k\e(B?
 
-@example
-;; IMAP example
-(setq auth (auth-source-user-or-password
-            '("login" "password")
-            "anyhostnamehere"
-            "imap"))
-(nth 0 auth) ; \e$B%m%0%$%sL>\e(B
-(nth 1 auth) ; \e$B%Q%9%o!<%I\e(B
-@end example
 @end defun
 
 @node GnuPG and EasyPG Assistant Configuration