Synch to No Gnus 200601250624.

diff --git a/pgg-ja.texi b/pgg-ja.texi
index 4643fb8..28d344b 100644 (file)
--- a/pgg-ja.texi
+++ b/pgg-ja.texi
@@ -108,6 +108,8 @@ PGG \e$B$r;H$&$?$a$K$O!"%"%W%j%1!<%7%g%s%W%m%0%i%`$NKAF,$G<!$N\e(B S \e$B<0$rI>2A$7
 @lisp
 (autoload 'pgg-encrypt-region "pgg"
   "Encrypt the current region." t)
+(autoload 'pgg-encrypt-symmetric-region "pgg"
+  "Encrypt the current region with symmetric algorithm." t)
 (autoload 'pgg-decrypt-region "pgg"
   "Decrypt the current region." t)
 (autoload 'pgg-sign-region "pgg"
@@ -137,26 +139,50 @@ PGG \e$B$r;H$&$?$a$K$O!"%"%W%j%1!<%7%g%s%W%m%0%i%`$NKAF,$G<!$N\e(B S \e$B<0$rI>2A$7
 \e$B$3$l$,BPOCE*$K8F$S=P$5$l$?>l9g$K$O!"%5!<%P!<$+$i8x3+80$r%@%&%s%m!<%I$9$k\e(B
 \e$B$+$I$&$+$r$"$J$?$K?R$M$^$9!#\e(B
 
-@deffn Command pgg-encrypt-region start end recipients &optional sign
+@deffn Command pgg-encrypt-region start end recipients &optional sign passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r\e(B @var{recipients} \e$B08$KAw$k$b$N$H$7\e(B
 \e$B$F0E9f2=$7$^$9!#BPOCE*$K8F$V$H!"<u?.<T$r?R$M$^$9!#\e(B
 
 \e$B0E9f2=$K@.8y$9$k$H!"8=:_$NNN0h$NFbMF$r0E9f2=$7$?%G!<%?$GCV$-49$($^$9!#\e(B
 
 \e$B%*%W%7%g%s0z?t\e(B @var{sign} \e$B$,\e(B @code{nil} \e$B$G$J$+$C$?$i!"=pL>$H0E9f2=$rF1;~\e(B
-\e$B$K9T$J$$$^$9!#8=:_!"$3$N5!G=$O\e(B GnuPG \e$B$@$1$GF0:n$7$^$9!#\e(B
+\e$B$K9T$J$$$^$9!#8=:_$3$N5!G=$O\e(B GnuPG \e$B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9$,!"\e(B
+PGP \e$B$d\e(B PGP5 \e$B$G$OF0:n$7$J$$$+$b$7$l$^$;$s!#\e(B
+
+\e$B%*%W%7%g%s0z?t\e(B @var{passphrase} \e$B$,\e(B @code{nil} \e$B$@$C$?$i!"%Q%9%U%l!<%:$N\e(B
+\e$B%-%c%C%7%e$+$i$+!"$^$?$O%f!<%6!<$KF~NO$7$F$b$i$&$3$H$K$h$C$F%Q%9%U%l!<%:\e(B
+\e$B$rF@$^$9!#\e(B
+@end deffn
+
+@deffn Command pgg-encrypt-symmetric-region &optional start end passphrase
+\e$B8=:_$N\e(B @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r!"6&DL800E9f\e(B (symmetric
+cipher) \e$B$G0E9f2=$7$^$9!#8F$S=P$7$?8e$G%Q%9%U%l!<%:$,?R$M$i$l$^$9!#\e(B
+
+\e$B%*%W%7%g%s0z?t\e(B @var{passphrase} \e$B$,\e(B @code{nil} \e$B$@$C$?$i!"%Q%9%U%l!<%:$N\e(B
+\e$B%-%c%C%7%e$+$i$+!"$^$?$O%f!<%6!<$KF~NO$7$F$b$i$&$3$H$K$h$C$F%Q%9%U%l!<%:\e(B
+\e$B$rF@$^$9!#\e(B
+
+\e$B6&DL800E9f$K$h$k0E9f2=$O!"8=:_\e(B GnuPG \e$B$@$1$G<BAu$5$l$F$$$^$9!#\e(B
 @end deffn
 
-@deffn Command pgg-decrypt-region start end
+@deffn Command pgg-decrypt-region start end &optional passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r2rFI$7$^$9!#2rFI$K@.8y$9$k$H!"8=:_\e(B
 \e$B$NNN0h$NFbMF$r2rFI$7$?%G!<%?$GCV$-49$($^$9!#\e(B
+
+\e$B%*%W%7%g%s0z?t\e(B @var{passphrase} \e$B$,\e(B @code{nil} \e$B$@$C$?$i!"%Q%9%U%l!<%:$N\e(B
+\e$B%-%c%C%7%e$+$i$+!"$^$?$O%f!<%6!<$KF~NO$7$F$b$i$&$3$H$K$h$C$F%Q%9%U%l!<%:\e(B
+\e$B$rF@$^$9!#\e(B
 @end deffn
 
-@deffn Command pgg-sign-region start end &optional cleartext
+@deffn Command pgg-sign-region start end &optional cleartext passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$N%F%-%9%H$K=pL>$7$^$9!#;0HVL\$N%*%W%7%g%s\e(B
 \e$B0z?t\e(B @var{cleartext} \e$B$,\e(B @code{nil} \e$B$G$O$J$$$+!"$"$k$$$OBPOCE*$K8F$P$l$?\e(B
 \e$B>l9g!"J,N%$5$l$?=pL>$r:n$j$^$;$s!#$=$N$h$&$J>l9g$K$O!"8=:_$NNN0h$NFbMF$r\e(B
 \e$B=pL>$7$?%G!<%?$GCV$-49$($^$9!#\e(B
+
+\e$B%*%W%7%g%s0z?t\e(B @var{passphrase} \e$B$,\e(B @code{nil} \e$B$@$C$?$i!"%Q%9%U%l!<%:$N\e(B
+\e$B%-%c%C%7%e$+$i$+!"$^$?$O%f!<%6!<$KF~NO$7$F$b$i$&$3$H$K$h$C$F%Q%9%U%l!<%:\e(B
+\e$B$rF@$^$9!#\e(B
 @end deffn
 
 @deffn Command pgg-verify-region start end &optional signature fetch
@@ -210,8 +236,9 @@ PGG \e$B$OC1=c$J%a%+%K%:%`$r;H$C$F%Q%9%U%l!<%:$r%-%c%C%7%e$7$^$9!#$=$l$r9T$J\e(B
 
 @defvar pgg-cache-passphrase
 @code{nil} \e$B$G$J$1$l$P!"%Q%9%U%l!<%:$rJ];}$7$^$9!#=i4|CM$O\e(B @code{t} \e$B$G$9!#\e(B
-\e$B$7$+$7!"$"$J$?$,%;%-%e%j%F%#$K$D$$$F5$3]$+$j$J$i!"$3$l$r\e(B @code{nil} \e$B$K@_\e(B
-\e$BDj$7$F$d$l$P!"%-%c%C%7%e$r$d$a$5$;$k$3$H$,$G$-$^$9!#\e(B
+\e$B$7$+$7!"$"$J$?$,%;%-%e%j%F%#$K$D$$$F5$3]$+$j$J$i!"$3$NJQ?t\e(B
+\e$B$r\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$K$h$C$F!"%Q%9%U%l!<%:$N%-%c%C%7%e$r$d$a$5$;\e(B
+\e$B$k$3$H$,$G$-$^$9!#\e(B
 @end defvar
 
 @defvar pgg-passphrase-cache-expiry
@@ -301,19 +328,26 @@ PGG \e$B$O\e(B PGP \e$B$N5!G=$K%"%/%;%9$9$k$HF1;~$K$=$l$r3+H/$9$k$?$a$K@_7W$5$l$?$N
 \e$B?t\e(B @var{type} \e$B$,Hs\e(B-@code{nil} \e$B$@$C$?$i!"HkL)$N80B+$+$i8!:w$7$^$9!#\e(B
 @end deffn
 
-@deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional sign
+@deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional sign passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r\e(B @var{recipients} \e$B08$KAw$k$b$N$H$7\e(B
 \e$B$F0E9f2=$7$^$9!#%*%W%7%g%s0z?t\e(B @var{sign} \e$B$,\e(B @code{nil} \e$B$G$J$+$C$?$i!"=p\e(B
 \e$BL>$H0E9f2=$rF1;~$K9T$J$$$^$9!#0E9f2=$K@.8y$9$k$H\e(B @code{t} \e$B$r!"<:GT$9$k\e(B
 \e$B$H\e(B @code{nil} \e$B$rJV$7$^$9!#\e(B
 @end deffn
 
-@deffn Method pgg-scheme-decrypt-region scheme start end
+@deffn Method pgg-scheme-encrypt-symmetric-region scheme start end &optional passphrase
+\e$B8=:_$N\e(B @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r!"6&DL800E9f\e(B (symmetric
+cipher) \e$B$H%Q%9%U%l!<%:$G0E9f2=$7$^$9!#0E9f2=$K@.8y$9$k$H\e(B @code{t} \e$B$rJV$7!"\e(B
+\e$B$=$&$G$J$1$l$P\e(B @code{nil} \e$B$rJV$7$^$9!#$3$N5!G=$O8=:_\e(B GnuPG \e$B$@$1$G<BAu$5\e(B
+\e$B$l$F$$$^$9!#\e(B
+@end deffn
+
+@deffn Method pgg-scheme-decrypt-region scheme start end &optional passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$NNN0h$r2rFI$7$^$9!#2rFI$K@.8y$9$k\e(B
 \e$B$H\e(B @code{t} \e$B$r!"<:GT$9$k$H\e(B @code{nil} \e$B$rJV$7$^$9!#\e(B
 @end deffn
 
-@deffn Method pgg-scheme-sign-region scheme start end &optional cleartext
+@deffn Method pgg-scheme-sign-region scheme start end &optional cleartext passphrase
 @var{start} \e$B$H\e(B @var{end} \e$B$N4V$N%F%-%9%H$K=pL>$7$^$9!#;0HVL\$N%*%W%7%g%s\e(B
 \e$B0z?t\e(B @var{cleartext} \e$B$,\e(B @code{nil} \e$B$G$O$J$$>l9g!"J,N%$5$l$?=pL>$r:n$j$^\e(B
 \e$B$;$s!#=pL>$K@.8y$9$k$H\e(B @code{t} \e$B$r!"<:GT$9$k$H\e(B @code{nil} \e$B$rJV$7$^$9!#\e(B