Fix translations.
authoryamaoka <yamaoka>
Fri, 25 Nov 2005 13:07:05 +0000 (13:07 +0000)
committeryamaoka <yamaoka>
Fri, 25 Nov 2005 13:07:05 +0000 (13:07 +0000)
message-ja.texi

index a491f19..f043f47 100644 (file)
@@ -527,14 +527,14 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 
 @subsection \e$B%X%C%@!<$K0\F0$9$k$?$a$NL?Na\e(B
 
-\e$B0J2<$NL?Na$OEv$N%X%C%@!<$K0\F0$7$^$9!#B8:_$7$J$1$l$PA^F~$5$l$^$9!#\e(B
+\e$B0J2<$NL?Na$OBP>]$K$J$C$F$$$k%X%C%@!<$K0\F0$7$^$9!#B8:_$7$J$1$l$PA^F~$5$l\e(B
+\e$B$^$9!#\e(B
 
 @table @kbd
-
 @item C-c ?
 @kindex C-c ?
 @findex describe-mode
-\e$B%a%C%;!<%8%b!<%I$N5-=R$G$9!#\e(B
+\e$B%a%C%;!<%8%b!<%I$N@bL@$rI=<($7$^$9!#\e(B
 
 @item C-c C-r C-t
 @kindex C-c C-f C-t
@@ -600,9 +600,9 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @item C-c C-f C-i
 @kindex C-c C-f C-i
 @findex message-insert-or-toggle-importance
-\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#$3$N%X%C\e(B
-\e$B%@!<$O<u?.<T$K$=$N%a%C%;!<%8$N=EMW@-$rCN$i$;$k$?$a$K;H$o$l$k$b$N$G$9!#$b\e(B
-\e$B$7%P%C%U%!!<$K$9$G$K$3$N%X%C%@!<$,$"$k>l9g$O!"\e(BRFC 1376 \e$B$K=`$8$?;0$D$N\e(B
+@samp{high} \e$B$H$$$&CM$r;}$D\e(B @samp{Importance:} \e$B%X%C%@!<$rA^F~$7$^$9!#$3$N\e(B
+\e$B%X%C%@!<$O<u?.<T$K$=$N%a%C%;!<%8$N=EMW@-$rCN$i$;$k$?$a$K;H$o$l$k$b$N$G$9!#\e(B
+\e$B$b$7%P%C%U%!!<$K$9$G$K$3$N%X%C%@!<$,$"$k>l9g$O!"\e(BRFC 1376 \e$B$K=`$8$?;0$D$N\e(B
 \e$BCM\e(B @samp{low}\e$B!"\e(B@samp{normal} \e$B$*$h$S\e(B @samp{high} \e$B$r=[4D$5$;$^$9!#\e(B
 
 @item C-c C-f C-a
@@ -610,13 +610,13 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @findex message-generate-unsubscribed-mail-followup-to
 \e$B9VFI$7$F$$$J$$%a!<%j%s%0%j%9%H$KEj9F$9$k>l9g$K8+9g$C\e(B
 \e$B$?\e(B @samp{Mail-Followup-To:} \e$B%X%C%@!<$rA^F~$7$^$9!#9VFI$7$F$$$J$$%a!<%j%s\e(B
-\e$B%0%j%9%H$K855-;v$rEj9F$9$k$H$-$O!"\e(B@samp{Mail-Followup-To:} \e$B$r<j$G=q$+$J\e(B
-\e$B$1$l$P$J$j$^$;$s!#FbMF$O!"$U$D$&$O%a!<%j%s%0%j%9%H$N%"%I%l%9$H$"$J$?<+?H\e(B
-\e$B$N%"%I%l%9$G$9!#$3$N4X?t$O$=$N$h$&$J%X%C%@!<$r<+F0E*$KA^F~$7$^$9!#$3$l$O\e(B
-\e$B8=:_$N%a!<%k$N%P%C%U%!!<$+$i\e(B @samp{To:} \e$B%X%C%@!<$NFbMF$rH4$-=P$7!"$=$l$K\e(B
-\e$B8=:_$N\e(B @code{user-mail-address} \e$B$rDI2C$7$^$9!#\e(B
+\e$B%0%j%9%H$K855-;v$rEj9F$9$k$H$-$O!"\e(B@samp{Mail-Followup-To:} \e$B%X%C%@!<$K<j\e(B
+\e$B$G5-F~$7$J$1$l$P$J$j$^$;$s!#FbMF$O!"IaDL$O%a!<%j%s%0%j%9%H$N%"%I%l%9$H$"\e(B
+\e$B$J$?<+?H$N%"%I%l%9$G$9!#$3$N4X?t$O$=$N$h$&$J%X%C%@!<$r<+F0E*$KA^F~$7$^$9!#\e(B
+\e$B$3$l$O8=:_$N%a!<%k$N%P%C%U%!!<$+$i\e(B @samp{To:} \e$B%X%C%@!<$NFbMF$rH4$-=P$7!"\e(B
+\e$B$=$l$K8=:_$N\e(B @code{user-mail-address} \e$B$rDI2C$7$^$9!#\e(B
 
-\e$BG$0U$N0z?t$G$"$k\e(B @code{include-cc} \e$B$,Hs\e(B-@code{nil} \e$B$@$C$?>l9g$O!"\e(B
+\e$B>JN,2DG=$J0z?t\e(B @code{include-cc} \e$B$,\e(B @code{nil} \e$B$G$O$J$$>l9g$O!"\e(B
 @samp{Cc:} \e$B%X%C%@!<$K$"$k%"%I%l%9$b\e(B @samp{Mail-Followup-To:} \e$B%X%C%@!<$K\e(B
 \e$BCV$+$l$^$9!#\e(B
 @end table
@@ -624,7 +624,6 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @subsection \e$B%X%C%@!<$rJQ99$9$k$?$a$NL?Na\e(B
 
 @table @kbd
-
 @item C-c C-o
 @kindex C-c C-o
 @findex message-sort-headers
@@ -642,8 +641,8 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @item C-c C-n
 @kindex C-c C-n
 @findex message-insert-newsgroups
-\e$BJVEz$7$F$$$k5-;v$N\e(B @code{Followup-To} \e$B$b$7$/$O!"\e(B@code{Nesgroups} \e$B%X%C%@!<\e(B
-\e$B$rH?1G$7$?\e(B @code{Newsgroups} \e$B%X%C%@!<$rA^F~$7$^\e(B
+\e$BJVEz$7$h$&$H$9$k5-;v$N\e(B @code{Followup-To} \e$B$b$7$/$O!"\e(B@code{Nesgroups} \e$B%X%C\e(B
+\e$B%@!<$rH?1G$7$?\e(B @code{Newsgroups} \e$B%X%C%@!<$rA^F~$7$^\e(B
 \e$B$9\e(B (@code{message-insert-newsgroups})\e$B!#\e(B
 
 @item C-c C-l
@@ -657,57 +656,61 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @kindex C-c M-n
 @findex message-insert-disposition-notification-to
 \e$B3+Iu3NG'MW5a$rA^F~$7$^$9!#\e(B
-(@code{message-insert-disposition-notification-to})\e$B!#$3$l$O!"$b$7<u?.<T\e(B
-\e$B$,\e(B RFC 2298 \e$B$r%5%]!<%H$7$F$$$?$i!"H`=w$K$=$N%a%C%;!<%8$r<u$1<h$C$?$3$H$r\e(B
-\e$BCN$i$;$FM_$7$$$3$H$r0UL#$7$^$9!#\e(B
+(@code{message-insert-disposition-notification-to})\e$B!#$b$7<u?.<T$,\e(B RFC
+2298 \e$B$r%5%]!<%H$7$F$$$l$P!"H`=w$O$=$N%a%C%;!<%8$r<u$1<h$C$?$3$H$rCN$i$;\e(B
+\e$B$F$/$l$k$G$7$g$&!#\e(B
 
 @item M-x message-insert-importance-high
 @kindex M-x message-insert-importance-high
 @findex message-insert-importance-high
 @cindex Importance
-\e$BCM\e(B @samp{high} \e$B$r;}$D\e(B @samp{Importance} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
-\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
+@samp{high} \e$B$H$$$&CM$r;}$D\e(B @samp{Importance} \e$B%X%C%@!<$r\e(B (\e$BI,MW$J$i$9$G$K\e(B
+\e$BB8:_$9$k$b$N$r>C5n$7$F$+$i\e(B) \e$BA^F~$7$^$9!#\e(B
 
 @item M-x message-insert-importance-low
 @kindex M-x message-insert-importance-low
 @findex message-insert-importance-low
 @cindex Importance
-\e$BCM\e(B @samp{low} \e$B$r;}$D\e(B @samp{Importance} \e$B%X%C%@!<$rA^F~$7$^$9!#I,MW$J\e(B
-\e$B$i\e(B (\e$B$9$G$K$"$k\e(B) \e$B%X%C%@!<$r>C5n$7$F$+$i!#\e(B
+@samp{low} \e$B$H$$$&CM$r;}$D\e(B @samp{Importance} \e$B%X%C%@!<$r\e(B (\e$BI,MW$J$i$9$G$KB8\e(B
+\e$B:_$9$k$b$N$r>C5n$7$F$+$i\e(B) \e$BA^F~$7$^$9!#\e(B
 
 @item C-c C-f s
 @kindex C-c C-f s
 @findex message-change-subject
 @cindex Subject
 \e$B8=:_$N\e(B @samp{Subject} \e$B%X%C%@!<$rJQ99$7$^$9!#?7$7$$\e(B @samp{Subject} \e$B$r?R$M\e(B
-\e$B$F\e(B @samp{(was: <\e$B8E$$I=Bj\e(B>)} \e$B$rDI2C$7$^$9!#8E$$I=Bj$OJV?.$9$k$H$-$K:o=|$9\e(B
-\e$B$k$3$H$,$G$-$^$9!#\e(B@code{message-subject-trailing-was-query}
-(@pxref{Message Headers}) \e$B$r8+$F2<$5$$!#\e(B
+\e$B$F\e(B @samp{(was: <\e$B8E$$I=Bj\e(B>)} \e$B$rDI2C$7$^$9!#$=$&$$$&5-;v$r<u$1<h$C$??M$,$5\e(B
+\e$B$i$KJV?.$9$k$H$-$K!"8E$$I=Bj$O:o=|$9$k$3$H$,$G$-$^$9!#\e(B
+@code{message-subject-trailing-was-query} (@ref{Message Headers}) \e$B$r8+$F\e(B
+\e$B2<$5$$!#\e(B
 
 @item C-c C-f x
 @kindex C-c C-f x
 @findex message-cross-post-followup-to
 @vindex message-cross-post-default
+@vindex message-cross-post-note-function
 @cindex X-Post
 @cindex cross-post
-\e$B%/%m%9%]%9%H$9$k$?$a$KDI2C$9\e(B
-\e$B$k\e(B @samp{Newsgroups} \e$B$H\e(B @samp{FollowUp-To} \e$B$r?R$M$^$9!#\e(B
-@code{message-cross-post-followup-to} \e$B$O\e(B @samp{FollowUp-To} \e$B$*$h\e(B
-\e$B$S\e(B @samp{Newsgroups} \e$B$r!"%0%k!<%W$r;X$7<($9$h$&$K@Z$jNv$-$^$9!#\e(B
-@code{message-cross-post-default} \e$B$,\e(B @code{nil} \e$B$@$C$?$j@\F,0z\e(B
-\e$B?t\e(B @samp{Follow-Up} \e$BIU$-$G8F$P$l$k$H!"%a%C%;!<%8$O%/%m%9%]%9%H$5$l$^$;\e(B
-\e$B$s!#\e(B
+\e$B%/%m%9%]%9%H$N$?$a$K!"BP>]%0%k!<%W$H$H$b$K\e(B @samp{FollowUp-To} \e$B%X%C%@!<$r\e(B
+\e$B@_Dj$7!"$=$NBP>]%0%k!<%W$,\e(B @samp{Newsgroups} \e$B%X%C%@!<$KB8:_$7$J$+$C$?$i\e(B
+\e$B$=$3$KDI2C$7!"$+$DK\J8$KCm0U=q$-$rF~$l$^$9!#\e(B
+@code{message-cross-post-default} \e$B$,\e(B @code{nil} \e$B$K$J$C$F$$$k$+!"$^$?$O$3\e(B
+\e$B$N%3%^%s%I$,@\F,0zIU$-$G8F$P$l$k$H!"\e(B@samp{Follow-Up} \e$B%X%C%@!<$,@_Dj$5$l\e(B
+\e$B$k$@$1$G!"\e(B@samp{Newsgroups} \e$B%X%C%@!<$X$NDI2C$O9T$J$o$l$^$;$s!#Cm0U=q$-$r\e(B
+\e$BF~$l$k4X?t$O\e(B @code{message-cross-post-note-function} \e$BJQ?t$G@)8f$5$l$^$9!#\e(B
 
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
 @samp{To} \e$B%X%C%@!<$NFbMF$r\e(B @samp{Cc} \e$B$+\e(B @samp{Bcc} \e$B%X%C%@!<$NFbMF$GCV$-\e(B
-\e$B49$($^$9!#\e(B
+\e$B49$($^$9!#\e(B(@samp{Cc} \e$B%X%C%@!<$,L5$$>l9g$K8B$C$F!"Be$o$j$K\e(B @samp{Bcc} \e$B%X%C\e(B
+\e$B%@!<$,;H$o$l$^$9!#\e(B)
 
 @item C-c C-f w
 @kindex C-c C-f w
 @findex message-insert-wide-reply
-\e$B9-$$JVEz$r$7$?$h$&$K\e(B @samp{To} \e$B$H\e(B @samp{Cc} \e$B%X%C%@!<$rA^F~$7$^$9!#\e(B
+\e$B=i$a$O$=$N%a%C%;!<%8$,9-$$JVEz$N$?$a$K:n$i$l$?$b$N$G$J$+$C$?>l9g$G$b!"9-\e(B
+\e$B$$JVEz$r$7$F$$$k$h$&$K\e(B @samp{To} \e$B$H\e(B @samp{Cc} \e$B%X%C%@!<$rA^F~$7$^$9!#\e(B
 
 @item C-c C-f a
 @kindex C-c C-f a
@@ -717,9 +720,9 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @cindex X-No-Archive
 @samp{X-No-Archive: Yes} \e$B$r%X%C%@!<$KA^F~$7$F!"K\J8$KCm0U=q$-$rF~$l$^$9!#\e(B
 \e$B%X%C%@!<$HCm0U=q$-\e(B
-\e$B$O\e(B @code{message-archive-header} \e$B$H\e(B @code{message-archive-note} \e$B$G%+%9%?\e(B
-\e$B%^%$%:$9$k$3$H$,$G$-$^$9!#@\F,0z?tIU$-$G8F$P$l$k$H!"A^F~$9$k%F%-%9%H$rMW\e(B
-\e$B5a$7$^$9!#K\J8$KCm0U=q$-$rF~$l$?$/$J$$>l9g$O!"\e(B
+\e$B$O\e(B @code{message-archive-header} \e$B$H\e(B @code{message-archive-note} \e$B$r;H$C$F\e(B
+\e$B%+%9%?%^%$%:$9$k$3$H$,$G$-$^$9!#@\F,0z?tIU$-$G8F$P$l$k$H!"A^F~$9$k%F%-%9\e(B
+\e$B%H$rMW5a$7$^$9!#K\J8$KCm0U=q$-$rF~$l$?$/$J$$>l9g$O!"\e(B
 @code{message-archive-note} \e$B$r\e(B @code{nil} \e$B$K$7$F2<$5$$!#\e(B
 @end table
 
@@ -741,23 +744,21 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @kindex C-a
 @findex message-beginning-of-line
 @vindex message-beginning-of-line
-\e$B%X%C%@!<$NCM$N$H$3$m$K$$$k$H$-$O9T$N@hF,$K0\F0$7!"$=$&$G$J$$$H$-$O%X%C%@!<\e(B
-\e$B$NCM$N@hF,$K0\F0$7$^$9!#\e(B(\e$B%X%C%@!<$NCM$O%X%C%@!<L>$H%3%m%s$N8e$KMh$^\e(B
-\e$B$9!#\e(B) \e$B$3$NF0:n$OJQ?t\e(B @code{message-beginning-of-line} \e$B$r%H%0%k$9$k$3$H$K\e(B
-\e$B$h$C$FL58z$K$9$k$3$H$,$G$-$^$9!#\e(B
+\e$B%X%C%@!<$NCM$N@hF,$K$$$k$H$-$O9T$N@hF,$K0\F0$7!"$=$&$G$J$$$H$-$O%X%C%@!<\e(B
+\e$B$NCM$N@hF,$K0\F0$7$^$9!#\e(B(\e$B%X%C%@!<$NCM$H$$$&$N$O!"%X%C%@!<L>$*$h$S%3%m%s\e(B
+\e$B$N8e$K$"$k$b$N$G$9!#\e(B) \e$B$3$NF0:n$OJQ?t\e(B @code{message-beginning-of-line} \e$B$r\e(B
+\e$B%H%0%k@Z$jBX$($9$k$3$H$K$h$C$FL58z$K$9$k$3$H$,$G$-$^$9!#\e(B
 @end table
 
 @node Insertion
 @section \e$BA^F~\e(B
 
 @table @kbd
-
 @item C-c C-y
 @kindex C-c C-y
 @findex message-yank-original
-\e$B%P%C%U%!!<\e(B @code{gnus-article-copy} \e$B$K$"$k%a%C%;!<%8$r%a%C%;!<%8%P%C%U%!!<\e(B
-\e$B$KE=$jIU$1$^$9!#IaDL$O\e(B @code{gnus-article-copy} \e$B$OJVEz$7$h$&$H$7$F$$$k%a%C\e(B
-\e$B%;!<%8$G$9\e(B (@code{messsage-yank-original})\e$B!#\e(B
+\e$BJVEz$7$h$&$H$7$F$$$k%a%C%;!<%8$r%a%C%;!<%8%P%C%U%!!<$KE=$jIU$1$^\e(B
+\e$B$9\e(B (@code{messsage-yank-original})\e$B!#\e(B
 
 @item C-c C-M-y
 @kindex C-c C-M-y
@@ -768,12 +769,12 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @item C-c C-q
 @kindex C-c C-q
 @findex message-fill-yanked-message
-\e$BE=$jIU$1$i$l$?%a%C%;!<%8$r@^$jJV$7$^\e(B
-\e$B$9\e(B (@code{message-fill-yanked-message})\e$B!#7Y9p\e(B: \e$B$b$7!"0zMQ$N=,47$,JQ$G$"\e(B
-\e$B$k$J$i!"E=$jIU$1$i$l$?J8>O$r$R$I$/$0$A$c$0$A$c$K$7$F$7$^$&$+$b$7$l$^$;$s!#\e(B
-\e$B$=$l$,0BA4$G$"$k$HCN$k$H!"$9$0$K?M?4CO$D$/$G$7$g$&$,!#$H$K$+$/!"\e(B
-@kbd{C-x u} (@code{undo}) \e$B$,;HMQ2DG=$G!"Bg>fIW$G$"$k$H8@$&$3$H$r3P$($F$*\e(B
-\e$B$$$F2<$5$$!#\e(B
+\e$BE=$jIU$1$i$l$?%a%C%;!<%8$r@^$jJV$7$F<*$rB7$($^\e(B
+\e$B$9\e(B (@code{message-fill-yanked-message})\e$B!#7Y9p\e(B: \e$B$b$7JQ$J$d$jJ}$G0zMQ$5$l\e(B
+\e$B$F$$$k$H!"E=$jIU$1$i$l$?J8>O$r$R$I$/$0$A$c$0$A$c$K$7$F$7$^$&$+$b$7$l$^$;\e(B
+\e$B$s!#$b$C$H$b!"$I$s$J$b$N$,0BA4$+$O!"$9$0$K$o$+$k$G$7$g$&$1$l$I!#$H$K$+$/!"\e(B
+\e$B2?$,5/$-$F$b\e(B @kbd{C-x u} (@code{undo}) \e$B$,;H$($k$N$@$+$iLdBjL5$$$3$H$@$1\e(B
+\e$B$O!"3P$($F$*$$$F2<$5$$!#\e(B
 
 @item C-c C-w
 @kindex C-c C-w
@@ -788,18 +789,22 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @item C-c M-m
 @kindex C-c M-m
 @findex message-mark-inserted-region
-\e$B8=:_$N5-;v$N$$$/$D$+$NNN0h$r!"$=$l$i$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#\e(B
+\e$B8=:_$N5-;v$N$"$kNN0h$r!"$=$l$i$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#\e(B
 @code{message-mark-insert-begin} \e$B$H\e(B @code{message-mark-insert-end} \e$B$r8+\e(B
-\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H\e(B slrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
-\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B
+\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H!"\e(Bslrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
+\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B(\e$BLuCm\e(B: \e$B$=$&\e(B
+\e$B$$$&%a%C%;!<%8$r\e(B Gnus \e$B$GI=<($9$k$H!"%G%#%U%)%k%H$G$O$=$NNN0h$,0l$D$N%Q!<\e(B
+\e$B%H$H$7$F07$o$l!"$^$?6/D4I=<($5$l$^$9!#\e(B)
 
 @item C-c M-f
 @kindex C-c M-f
 @findex message-mark-insert-file
-\e$B8=:_$N5-;v$K!"%?%0$G0O$^$l$?%U%!%$%k$rA^F~$7$^$9!#\e(B
+\e$B8=:_$N5-;v$K%U%!%$%k$rA^F~$7$F!"$=$NNN0h$r0O$`$?$a$N%?%0$G0u$rIU$1$^$9!#\e(B
 @code{message-mark-insert-begin} \e$B$H\e(B @code{message-mark-insert-end} \e$B$r8+\e(B
-\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H\e(B slrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
-\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B
+\e$B$F2<$5$$!#@\F,0z?t$rIU$1$F;H$&$H!"\e(Bslrn \e$B$U$&$N\e(B verbatim (\e$BJ8>O$r0l8@0l6g$=\e(B
+\e$B$N$^$^I=$9\e(B) \e$B5-9f$NBP\e(B (@samp{#v+} \e$B$H\e(B @samp{#v-}) \e$B$r;H$$$^$9!#\e(B(\e$BLuCm\e(B: \e$B$=$&\e(B
+\e$B$$$&%a%C%;!<%8$r\e(B Gnus \e$B$GI=<($9$k$H!"%G%#%U%)%k%H$G$O$=$NNN0h$,0l$D$N%Q!<\e(B
+\e$B%H$H$7$F07$o$l!"$^$?6/D4I=<($5$l$^$9!#\e(B)
 @end table
 
 @node MIME
@@ -809,22 +814,22 @@ Message \e$B$OIaDL$O$&$^$/F0:n$7$^$9$,!"$H$-$I$-4V0c$($b$7$^$9!#$=$l$i$N4V0c\e(B
 @cindex multipart
 @cindex attachment
 
-Message \e$B$O\e(B @acronym{MIME} \e$B$KBP1~$7$?!"Aw?.MQ$N%(!<%8%'%s%H$G$9!#$U$D$&Mx\e(B
-\e$BMQ<T$O!"\e(B@acronym{MIME} \e$B$K$9$k$?$a$K2?$+$9$kI,MW$O$"$j$^$;$s!#\e(BMessage \e$B$O\e(B
-\e$B<+F0E*$K\e(B @code{Content-Type} \e$B$*$h$S\e(B @code{Content-Transfer-Encoding} \e$B%X%C\e(B
+Message \e$B$O\e(B @acronym{MIME} \e$B$KBP1~$7$?Aw?.MQ$N%(!<%8%'%s%H$G$9!#$U$D$&MxMQ\e(B
+\e$B<T$O!"\e(B@acronym{MIME} \e$B$K$9$k$?$a$K2?$+$9$kI,MW$O$"$j$^$;$s!#\e(BMessage \e$B$O<+\e(B
+\e$BF0E*$K\e(B @code{Content-Type} \e$B$*$h$S\e(B @code{Content-Transfer-Encoding} \e$B%X%C\e(B
 \e$B%@!<$rIU2C$7$^$9!#\e(B
 
-\e$BMxMQ<T$,\e(B @acronym{MIME} \e$B$G%^%k%A%Q!<%H$r;H$$$?$$:G$bE57?E*$J$b$N$O!"Aw=P\e(B
-\e$B$9$k%a!<%k$K!VE:IU!W$rIU$12C$($k$3$H$G$9!#$3$l$O\e(B @kbd{C-c C-a} \e$B%3%^%s%I\e(B
-\e$B$G9T$J$&$3$H$,$G$-!"$=$N:]%U%!%$%kL>$H\e(B @acronym{MIME} \e$B%?%$%W$,?R$M$i$l$^\e(B
-\e$B$9!#\e(B
+\e$BMxMQ<T$,\e(B @acronym{MIME} \e$B$G%^%k%A%Q!<%H$r;H$$$?$$:G$b0lHLE*$J$b$N$O!"Aw=P\e(B
+\e$B$9$k%a!<%k$K!VE:IU!W$rIU$12C$($k$3$H$G$7$g$&!#$3$l$O\e(B @kbd{C-c C-a} \e$B%3%^\e(B
+\e$B%s%I$G9T$J$&$3$H$,$G$-!"$=$N:]%U%!%$%kL>$H\e(B @acronym{MIME} \e$B%?%$%W$,?R$M$i\e(B
+\e$B$l$^$9!#\e(B
 
 @vindex mml-dnd-protocol-alist
 @vindex mml-dnd-attach-options
 \e$B$"$J$?$N\e(B Emacs \e$B$,%I%i%C%0!u%I%m%C%W$r%5%]!<%H$7$F$$$l$P!"\e(BMessage \e$B%P%C%U%!\e(B
 \e$B!<$K%U%!%$%k$r%I%m%C%W$9$k$3$H$b$G$-$^$9!#JQ\e(B
 \e$B?t\e(B @code{mml-dnd-protocol-alist} \e$B$G!"\e(BMessage \e$B%P%C%U%!!<$K%U%!%$%k$r%I%m%C\e(B
-\e$B%W$7$?$H$-$K$I$s$J$3$H$r9T$J$&$+$r;XDj$7$^$9!#JQ\e(B
+\e$B%W$9$k$H$-$K$I$s$J$3$H$r9T$J$&$+$r;XDj$7$^$9!#JQ\e(B
 \e$B?t\e(B @code{mml-dnd-attach-options} \e$B$O!"%U%!%$%k$r%I%m%C%W$9$k$H$-$K$I\e(B
 \e$B$N\e(B @acronym{MIME} \e$B%*%W%7%g%s$r;XDj$7$?$$$+$r@)8f$7$^$9!#$=$l$r%j%9%H$K$9\e(B
 \e$B$k>l9g!"M-8z$J%*%W%7%g%s$O\e(B @code{type}, @code{description} \e$B$*$h\e(B
@@ -833,8 +838,8 @@ Message \e$B$O\e(B @acronym{MIME} \e$B$KBP1~$7$?!"Aw?.MQ$N%(!<%8%'%s%H$G$9!#$U$D$&M
 \e$B%7%g%s$r;XDj$9$k$+$I$&$+$r?R$M$^$9!#\e(B
 
 \e$B$5$i$K\e(B @acronym{MML} \e$B8@8l\e(B (@pxref{Composing, ,MIME \e$B%a%C%;!<%8$N:n@.\e(B,
-emacs-mime-ja, The Emacs MIME Manual}) \e$B$r;H$($P!"J#;($J%^%k%A%Q!<%H$r>!\e(B
-\e$B<j5$$^$^$K:n$k$3$H$b$G$-$^$9!#\e(B
+emacs-mime-ja, The Emacs MIME Manual}) \e$B$r;H$($P!"$I$s$JJ#;($J%^%k%A%Q!<\e(B
+\e$B%H$G$b<+M3$K:n$k$3$H$,$G$-$^$9!#\e(B
 
 @node IDNA
 @section \e$B9q:]2=%I%a%$%sL>\e(B
@@ -847,18 +852,18 @@ Message \e$B$O\e(B @acronym{IDNA} \e$B$K=`5r$7$?Aw?.%(!<%8%'%s%H$G$9!#MxMQ<T\e(B
 Message \e$B$O\e(B @code{From}\e$B!"\e(B@code{To} \e$B$*$h$S\e(B @code{Cc} \e$B%X%C%@!<$K$"$k\e(B
 \e$BHs\e(B-@acronym{ASCII} \e$B%I%a%$%sL>$r<+F0E*$K%(%s%3!<%I$7$^$9!#\e(B
 
-\e$B$b$C$H\e(B @acronym{IDNA} \e$B$,M-L>$K$J$k$^$G$O!"<B:]$K%I%a%$%sL>\e(B
-\e$B$r\e(B @acronym{IDNA} \e$B%(%s%3!<%I$9$Y$->l9g$G$b\e(B Message \e$B$O3NG'$r5a$a$^$9!#8=\e(B
-\e$B:_$G$O%I%a%$%sL>$KHs\e(B-@acronym{ASCII} \e$BJ8;z$r4^$`$3$H$,$G$-$k$3$H$KMxMQ<T\e(B
-\e$B$N4v?M$+$O5$$E$$$F$$$J$$$+$b$7$l$J$$$N$G!"H`$i$,6vA3$K\e(B
+\e$B$b$C$H\e(B @acronym{IDNA} \e$B$,M-L>$K$J$k$^$G$O!"\e(BMessage \e$B$O<B:]$K%I%a%$%sL>\e(B
+\e$B$r\e(B @acronym{IDNA} \e$B%(%s%3!<%I$9$Y$-$+$I$&$+$N3NG'$r5a$a$k$3$H$K$J$C$F$$$^\e(B
+\e$B$9!#:#$N$H$3$m$O!"MxMQ<T$N4v?M$+$O%I%a%$%sL>$KHs\e(B-@acronym{ASCII} \e$BJ8;z$r\e(B
+\e$B4^$`$3$H$,$G$-$k$3$H$K5$$E$$$F$$$J$$$+$b$7$l$J$$$N$G!"H`$i$,6vA3$K\e(B
 \e$BHs\e(B-@acronym{ASCII} \e$B%I%a%$%sL>$r%?%$%W$7$F$7$^$C$?$H$-$N$?$a$K0BA4%M%C%H\e(B
 \e$B$rD%$C$F$$$k$o$1$G$9!#\e(B
 
 @vindex message-use-idna
 \e$BJQ?t\e(B @code{message-use-idna} \e$B$O\e(B @acronym{IDNA} \e$B$r;H$&$+$I$&$+$r@)8f$7$^\e(B
 \e$B$9!#$3$NJQ?t$,\e(B @code{nil} \e$B$@$C$?$i\e(B @acronym{IDNA} \e$B%(%s%3!<%I$O9T$J$o$l$^\e(B
-\e$B$;$s!#%7%s%\%k\e(B @code{ask} \e$B$K@_Dj$5$l$F$$$k$HMxMQ<T$O3NG'$r5a$a$i$l$^$9$,!"\e(B
-@code{t} \e$B$K@_Dj$5$l$F$$$k\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9\e(B) \e$B$H!"<+F0E*\e(B
+\e$B$;$s!#%7%s%\%k\e(B @code{ask} \e$B$K@_Dj$5$l$F$$$k$HMxMQ<T$O3NG'$r5a$a$i$l$^$9!#\e(B
+\e$B$^$?!"\e(B@code{t} \e$B$K@_Dj$5$l$F$$$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9\e(B)\e$B!"<+F0E*\e(B
 \e$B$K\e(B @acronym{IDNA} \e$B%(%s%3!<%I$,9T$J$o$l$^$9!#\e(B
 
 @findex message-idna-to-ascii-rhs
@@ -867,7 +872,7 @@ Message \e$B$O\e(B @code{From}\e$B!"\e(B@code{To} \e$B$*$h$S\e(B @code{Cc} \e$B%X%C%@!<
 \e$B$K\e(B @kbd{M-x message-idna-to-ascii-rhs RET} \e$B$r%?%$%W$7$F2<$5$$!#\e(B
 
 \e$B$3$N5!G=$r;H$&$K$O\e(B @uref{http://www.gnu.org/software/libidn/, GNU
-Libidn} \e$B$r%$%s%9%H!<%k$7$F$*$/I,MW$,$"$j$^$9!#\e(B
+Libidn} \e$B$r%$%s%9%H!<%k$7$F$*$+$J$1$l$P$J$j$^$;$s!#\e(B
 
 @node Security
 @section \e$B%;%-%e%j%F%#!<\e(B
@@ -879,84 +884,85 @@ Libidn} \e$B$r%$%s%9%H!<%k$7$F$*$/I,MW$,$"$j$^$9!#\e(B
 @cindex encrypt
 @cindex secure
 
-@acronym{MML} \e$B$r;H$C$F!"\e(BMessage \e$B$OEE;R=pL>$5$l$?!"$^$?$OEE;R0E9f2=$5$l$?\e(B
-\e$B%a%C%;!<%8$r:n$k$3$H$,$G$-$^$9!#\e(BMessage (\e$B$H8@$&$+\e(B @acronym{MML}) \e$B$O!"8=\e(B
-\e$B:_\e(B @acronym{PGP} (RFC 1991), @acronym{PGP/MIME} (RFC 2015/3156) \e$B$*$h\e(B
-\e$B$S\e(B @acronym{S/MIME} \e$B$r%5%]!<%H$7$^$9!#\e(B@acronym{MIME} \e$B%Q!<%H$KBP$7$F%;%-%e\e(B
-\e$B%j%F%#!<$NA`:n$r9T$J$&$?$a$N\e(B @acronym{MML} \e$B$X$N;X<($O!"0J2<$N$h$&$K!"=p\e(B
-\e$BL>$N>l9g$O\e(B @kbd{C-c C-m s} \e$B%-!<%^%C%W$r;H$C$F!"0E9f2=$N>l9g$O\e(B @kbd{C-c
-C-m c} \e$B%-!<%^%C%W$r;H$C$F9T$J$$$^$9!#\e(B
+@acronym{MML} \e$B8@8l$r;H$&$3$H$K$h$C$F!"\e(BMessage \e$B$OEE;R=pL>$5$l$?!"$^$?$OEE\e(B
+\e$B;R0E9f2=$5$l$?%a%C%;!<%8$r:n$k$3$H$,$G$-$^$9!#\e(BMessage (\e$B$H8@$&\e(B
+\e$B$+\e(B @acronym{MML}) \e$B$O!"8=:_\e(B @acronym{PGP} (RFC 1991), @acronym{PGP/MIME}
+(RFC 2015/3156) \e$B$*$h$S\e(B @acronym{S/MIME} \e$B$r%5%]!<%H$7$F$$$^$9!#\e(B
+@acronym{MIME} \e$B%Q!<%H$KBP$7$F%;%-%e%j%F%#!<$NA`:n$r9T$J$&$?$a\e(B
+\e$B$N\e(B @acronym{MML} \e$B$X$N;X<($O!"0J2<$N$h$&$K=pL>$N>l9g$O\e(B @kbd{C-c C-m s} \e$B%-!<\e(B
+\e$B%^%C%W$r;H$C$F!"0E9f2=$N>l9g$O\e(B @kbd{C-c C-m c} \e$B%-!<%^%C%W$r;H$C$F9T$J$$\e(B
+\e$B$^$9!#\e(B
 
 @table @kbd
 @item C-c C-m s s
 @kindex C-c C-m s s
 @findex mml-secure-message-sign-smime
 
-@acronym{S/MIME} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
+@acronym{S/MIME} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
 
 @item C-c C-m s o
 @kindex C-c C-m s o
 @findex mml-secure-message-sign-pgp
 
-@acronym{PGP} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
+@acronym{PGP} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
 
 @item C-c C-m s p
 @kindex C-c C-m s p
 @findex mml-secure-message-sign-pgpmime
 
-@acronym{PGP/MIME} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
+@acronym{PGP/MIME} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$KEE;R=qL>$7$^$9!#\e(B
 
 @item C-c C-m c s
 @kindex C-c C-m c s
 @findex mml-secure-message-encrypt-smime
 
-@acronym{S/MIME} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
+@acronym{S/MIME} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
 
 @item C-c C-m c o
 @kindex C-c C-m c o
 @findex mml-secure-message-encrypt-pgp
 
-@acronym{PGP} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
+@acronym{PGP} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
 
 @item C-c C-m c p
 @kindex C-c C-m c p
 @findex mml-secure-message-encrypt-pgpmime
 
-@acronym{PGP/MIME} \e$B$r;H$C$F!"8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
+@acronym{PGP/MIME} \e$B$r;H$C$F8=:_$N%a%C%;!<%8$rEE;R0E9f2=$7$^$9!#\e(B
 
 @item C-c C-m C-n
 @kindex C-c C-m C-n
 @findex mml-unsecure-message
-\e$B%a%C%;!<%8$+$i!"%;%-%e%j%F%#!<4XO"$N\e(B @acronym{MML} \e$B%?%0$r30$7$^$9!#\e(B
+\e$B%a%C%;!<%8$+$i%;%-%e%j%F%#!<4XO"$N\e(B @acronym{MML} \e$B%?%0$r:o=|$7$^$9!#\e(B
 @end table
 
 \e$B$3$l$i$N%3%^%s%I$O!"$=$N>l$G%a%C%;!<%8$K=pL>$7$?$j0E9f2=$9$k$o$1$G$O$J$/!"\e(B
-\e$B$=$l$i$OC1$K%;%-%e%j%F%#!<$N$?$a$NE,@Z$J\e(B @acronym{MML} \e$B%?%0$rA^F~$7$F!"\e(B
-\e$B%a%C%;!<%8$,<B:]$KAw?.$5$l$k$H$-$K$=$NF0:n$r<B9T$9$k$h$&$K!"\e(B
-@acronym{MML} \e$B%(%s%8%s$K;X<($rM?$($k$@$1$G$9!#$=$l$i$OB>$N;E;v!"Nc$($P0E\e(B
-\e$B9f2=$5$l$?%a!<%k$rAw$j$?$$Aj<j$N?M$N\e(B @acronym{S/MIME} \e$B$N>ZL@=q$rC5$7$F<h\e(B
-\e$B$j4s$;$k$h$&$J$3$H$b9T$J$&$+$b$7$l$^$;$s!#\e(Bmml \e$B2r@O%(%s%8%s\e(B
-\e$B$,\e(B @acronym{MML} \e$B$G=q$+$l$?%a%C%;!<%8$r\e(B @acronym{MIME} \e$B%a%C%;!<%8$KE,@Z\e(B
-\e$B$KJQ49$9$k$H$-!"%;%-%e%j%F%#!<$N$?$a$N%?%0$O!"%Q!<%H$^$?$O%^%k%A%Q!<%H$N\e(B
-\e$B$I$A$i$+0lJ}$N%?%0$GCV$-49$($i$l$^$9!#%a%C%;!<%8$,B>$N\e(B mml \e$B%Q!<%H$b4^$s\e(B
-\e$B$G$$$k>l9g$K$O%^%k%A%Q!<%H$N%?%0$,;H$o$l!"B>$N%Q!<%H$,L5$$>l9g$OC10l$N%Q!<\e(B
-\e$B%H$N%?%0$,;H$o$l$k$G$7$g$&!#$3$N$h$&$K$7$F!"=pL>$5$l$k\e(B/\e$B0E9f2=$5$l$k%^%k\e(B
-\e$B%A%Q!<%H$N%a%C%;!<%8$KBP$7!"%a%C%;!<%8!&%b!<%I$O!V@5$7$$$3$H\e(B (\e$BEPO?>&I8\e(B)\e$B!W\e(B
-(\e$B86J8\e(B: Right Thing (TM)) \e$B$r9T$J$$$^$9!#\e(B
-
-\e$B=pL>$=$7$FFC$K0E9f2=$O!"$7$P$7$P5!L)>pJs$rAw?.$9$k$H$-$K;H$o$l$k$N$G!"%a!<\e(B
-\e$B%k$,K\Ev$K=pL>$^$?$O0E9f2=$5$l$k$3$H$r3N<B$K$9$k$?$a$N!"2?$i$+$N<jCJ$rI,\e(B
-\e$BMW$H$9$k$G$7$g$&!#>e5-$N=pL>\e(B/\e$B0E9f2=%3%^%s%I$r<B9T$7$?8e$G$J$i!"\e(B@kbd{C-u
-C-c RET P} (@code{mml-preview}) \e$B$r;H$&$3$H$K$h$C$F!"@8$N5-;v$r2<8+$9$k$3\e(B
-\e$B$H$,2DG=$G$9!#$=$&$7$F!"$"$J$?$N0JA0$KBg@Z$@$C$??M$K4X$9$k!"$"$k$$$O!"$3\e(B
-\e$B$NA0$NLk$NJQ$J%Q!<%F%#!<$G!"$"$N$*$+$7$J?H$J$j$N?M$,<B:]$K$d$C$?$3$H$K4X\e(B
-\e$B$9$k$"$J$?$ND9$$GME]$,!"K\Ev$K0E9f2=$5$l$FAw?.$5$l$k$G$"$m$&$3$H$r!"3NG'\e(B
-\e$B$9$k$3$H$,$G$-$^$9!#\e(B
-
-@emph{\e$BCm0U\e(B!}  @acronym{PGP/MIME} \e$B$H\e(B @acronym{S/MIME} \e$B$N$I$A$i$b!"\e(B
-RFC822 \e$B%X%C%@!<$r=pL>\e(B/\e$B0E9f2=$7$^$;$s!#$=$l$i$O\e(B @acronym{MIME} \e$B%Q!<%H$K$N\e(B
-\e$B$_:nMQ$7$^$9!#5!L)$NI=Bj$H$H$b$K%a!<%k$rAw$C$F$7$^$&A0$K!"$3$N$3$H$r4N$K\e(B
-\e$BL?$8$F2<$5$$!#\e(B
+\e$BC1$K%;%-%e%j%F%#!<$N$?$a$NE,@Z$J\e(B @acronym{MML} \e$B%?%0$rA^F~$7$F!"%a%C%;!<\e(B
+\e$B%8$,<B:]$KAw?.$5$l$k$H$-$K$=$NF0:n$r<B9T$9$k$h$&$K!"\e(B@acronym{MML} \e$B%(%s%8\e(B
+\e$B%s$K;X<($rM?$($k$@$1$G$9!#$=$l$i$OB>$N;E;v!"Nc$($P0E9f2=$5$l$?%a!<%k$rAw\e(B
+\e$B$j$?$$Aj<j$N?M$N\e(B @acronym{S/MIME} \e$B$N>ZL@=q$rC5$7$F!"<h$j4s$;$k$h$&$J$3$H\e(B
+\e$B$b9T$J$&$+$b$7$l$^$;$s!#\e(Bmml \e$B2r@O%(%s%8%s$,\e(B @acronym{MML} \e$B$G=q$+$l$?%a%C\e(B
+\e$B%;!<%8$rE,@Z$K\e(B @acronym{MIME} \e$B%a%C%;!<%8$KJQ49$9$k$H$-!"%;%-%e%j%F%#!<$N\e(B
+\e$B$?$a$N%?%0$O!"%Q!<%H$^$?$O%^%k%A%Q!<%H$N$I$A$i$+$N%?%0$GCV$-49$($i$l$^$9!#\e(B
+\e$B%a%C%;!<%8$,B>$N\e(B mml \e$B%Q!<%H$b4^$s$G$$$k>l9g$K$O%^%k%A%Q!<%H$N%?%0$,;H$o\e(B
+\e$B$l!"B>$N%Q!<%H$,L5$$>l9g$OC10l$N%Q!<%H$N%?%0$,;H$o$l$k$G$7$g$&!#$3$N$h$&\e(B
+\e$B$K$7$F!"=pL>$5$l$k\e(B/\e$B0E9f2=$5$l$k%^%k%A%Q!<%H$N%a%C%;!<%8$KBP$7!"%a%C%;!<\e(B
+\e$B%8!&%b!<%I$O!V@5$7$$$3$H\e(B (\e$BEPO?>&I8\e(B)\e$B!W\e(B(\e$B86J8\e(B: the Right Thing (TM)) \e$B$r9T$J\e(B
+\e$B$$$^$9!#\e(B
+
+\e$B=pL>$=$7$FFC$K0E9f2=$O$7$P$7$P5!L)>pJs$rAw?.$9$k$H$-$K;H$o$l$k$N$G!"%a!<\e(B
+\e$B%k$,K\Ev$K=pL>$^$?$O0E9f2=$5$l$k$3$H$r3N$+$a$k$?$a$N2?$i$+$N<jCJ$rI,MW$H\e(B
+\e$B$9$k$G$7$g$&!#>e5-$N=pL>\e(B/\e$B0E9f2=%3%^%s%I$r<B9T$7$?8e$G$J$i!"\e(B@kbd{C-u C-c
+RET P} (@code{mml-preview}) \e$B$r;H$&$3$H$K$h$C$F@8$N5-;v$r2<8+$9$k$3$H$,2D\e(B
+\e$BG=$G$9!#$=$&$7$F!"$"$J$?$N0JA0$KBg@Z$@$C$??M$K4X$9$k!"$"$k$$$O!"$3$NA0$N\e(B
+\e$BLk$NJQ$J%Q!<%F%#!<$G!"$"$N$*$+$7$J?H$J$j$N?M$,<B:]$K$d$C$?$3$H$K4X$9$k$"\e(B
+\e$B$J$?$ND9$$GME]$,!"K\Ev$K0E9f2=$5$l$FAw?.$5$l$k$G$"$m$&$3$H$r3NG'$9$k$3$H\e(B
+\e$B$,$G$-$^$9!#\e(B
+
+@emph{\e$BCm0U\e(B!}  @acronym{PGP/MIME} \e$B$H\e(B @acronym{S/MIME} \e$B$N$I$A$i\e(B
+\e$B$b\e(B RFC822 \e$B%X%C%@!<$r=pL>\e(B/\e$B0E9f2=$7$^$;$s!#$=$l$i$O\e(B @acronym{MIME} \e$B%Q!<%H\e(B
+\e$B$K$N$_:nMQ$7$^$9!#5!L)$NI=Bj$H$H$b$K%a!<%k$rAw$C$F$7$^$&A0$K!"$3$N$3$H$r\e(B
+\e$B4N$KL?$8$F$*$$$F2<$5$$!#\e(B
 
 \e$B%a%C%;!<%8$r0E9f2=$9$k$H$-!"\e(BGnus \e$B$O%G%#%U%)%k%H$G!V=pL>\e(B+\e$B0E9f2=!W\e(B(\e$B%a%C%;!<\e(B
 \e$B%8$KBP$7$F=pL>$H0E9f2=$NN>J}$,9T$J$o$l$k\e(B) \e$B%b!<%I$r;H$$$^$9!#FCDj$N%a%C%;!<\e(B
@@ -964,73 +970,75 @@ RFC822 \e$B%X%C%@!<$r=pL>\e(B/\e$B0E9f2=$7$^$;$s!#$=$l$i$O\e(B @acronym{MIME} \e$B%Q!
 @code{mml-secure-message-encrypt-*} \e$B%3%^%s%I$K@\F,0z?t$rM?$($F\e(B (\e$BNc$(\e(B
 \e$B$P\e(B @kbd{C-u C-c C-m c p} \e$B$r;H$C$F\e(B) \e$B2<$5$$!#\e(B
 
-\e$B>e5-$N%;%-%e%j%F%#!<%3%^%s%I$r<B:]$K;H$&$N$O!"$5$[$IFq$7$/$"$j$^$;$s!#>/\e(B
-\e$B$J$/$H$b!"$9$Y$F$N4X78$9$k%W%m%0%i%`$,E,@Z$KDL?.$79g$&$3$H$r3N$+$a$k$3$H\e(B
-\e$B$HHf3S$7$F!#$=$3$G!"30It$N$I$s$J%i%$%V%i%j!<$^$?$O%W%m%0%i%`$,I,MW$+!"$*\e(B
-\e$B$h$S$$$/$D$+$N:3:Y$G0lHLE*$J%R%s%H$K$D$$$F!"=R$Y$k$3$H$K$7$^$9!#\e(B
+\e$B>e5-$N%;%-%e%j%F%#!<%3%^%s%I$r<B:]$K;H$&$N$O$5$[$IFq$7$/$"$j$^$;$s!#>/$J\e(B
+\e$B$/$H$b!"$9$Y$F$N4X78$9$k%W%m%0%i%`$,E,@Z$KDL?.$79g$&$3$H$r3N$+$a$k$3$H$H\e(B
+\e$BHf3S$7$F!#$=$3$G!"30It$N$I$s$J%i%$%V%i%j!<$^$?$O%W%m%0%i%`$,I,MW$+$K$D$$\e(B
+\e$B$F!"$*$h$S$$$/$D$+$N:3:Y$G0lHLE*$J%R%s%H$r=R$Y$k$3$H$K$7$^$9!#\e(B
 
 @subsection S/MIME \e$B$r;H$&\e(B
 
-@emph{\e$BCm0U\e(B!}  \e$B$3$N>O$O!"6aBeE*$J0E9fK!!"\e(B@acronym{S/MIME}\e$B!"$5$^$6$^\e(B
-\e$B$J\e(B PKCS \e$B$NI8=`!"\e(BOpenSSL \e$B$J$I$N4pAC$K!"$"$J$?$,@:DL$7$F$$$k$3$H$r2>Dj$7$^\e(B
-\e$B$9!#\e(B
-
-Message (\e$B$=$l$K\e(B @acronym{MML}) \e$B$G\e(B @acronym{S/MIME} \e$B$r%5%]!<%H$9$k$K$O!"\e(B
-OpenSSL \e$B$,I,MW$G$9!#\e(BOpenSSL \e$B$O<B:]$N\e(B @acronym{S/MIME} \e$B$K$h$k=pL>\e(B/\e$B0E9f2=\e(B
-\e$B$N=hM}$r<B9T$7$^$9!#\e(BOpenSSL \e$B$O\e(B @uref{http://www.openssl.org/} \e$B$G8+$D$+$j\e(B
-\e$B$^$9!#\e(BOpenSSL 0.9.6 \e$B0J9_$N$b$N$,F0:n$9$k$O$:$G$9!#%P!<%8%g%s\e(B 0.9.5a \e$B$O>Z\e(B
-\e$BL@=q$+$i%a!<%k%"%I%l%9$rCj=P$9$k$3$H$,$G$-$J$$$7!"\e(B@acronym{MIME} \e$B$N%;%Q\e(B
-\e$B%l!<%?$KM>7W$J\e(B CR \e$BJ8;z$rA^F~$9$k$N$G!"JQ$J%a!<%k$rAw$k?M$@$H;W$o$l$?$/$J\e(B
-\e$B$1$l$P!"$=$l$r;H$&$3$H$rHr$1$?$$$G$7$g$&!#\e(B(\e$B$b$C$H$b!"$"$J$?\e(B
-\e$B$O\e(B @acronym{S/MIME} \e$B$N%a%C%;!<%8$rAw$k$3$H$K$h$C$F!"$=$NJQ?M%3%s%F%9%H$G\e(B
-\e$B$N>!Mx$rF($7$^$7$?$,!#\e(B)
-
-\e$B0E9f2=$5$l$?%a!<%k$rAw$k$?$a$K!"8D?M$N>ZL@=q$OMW$j$^$;$s!#\e(BMessage
-(@acronym{MML}) \e$B$O!"DL?.$7$?$$Aj<j$N?M$N>ZL@=q$rI,MW$H$7$^$9$1$l$I!#\e(B
-\e$B$3$N$3$H$O\e(B @kbd{C-c C-m c s} \e$B$r%?%$%W$7$?$H$-$K?R$M$i$l$^$9!#$3$N>ZL@=q\e(B
-\e$B$r%m!<%+%k%U%!%$%k$+\e(B DNS \e$B$+$i<h$j4s$;$k$?$a$K$O!"8=:_Fs$D$NJ}K!$,$"$j$^\e(B
-\e$B$9!#%m!<%+%k%U%!%$%k$rA*Br$7$?>l9g!"$=$l$O\e(B @acronym{PEM} \e$B7A<0$K$h\e(B
+@emph{\e$BCm0U\e(B!}  \e$B$3$N>O$O6aBeE*$J0E9fK!!"\e(B@acronym{S/MIME}\e$B!"$5$^$6$^\e(B
+\e$B$J\e(B PKCS \e$B$NI8=`!"\e(BOpenSSL \e$B$J$I$N4pAC$K!"$"$J$?$,@:DL$7$F$$$k$3$H$rA[Dj$7$F\e(B
+\e$B$$$^$9!#\e(B
+
+Message (\e$B$=$l$K\e(B @acronym{MML}) \e$B$,\e(B @acronym{S/MIME} \e$B$r%5%]!<%H$9$k$K\e(B
+\e$B$O\e(B OpenSSL \e$B$,I,MW$G$9!#\e(BOpenSSL \e$B$O<B:]$N\e(B @acronym{S/MIME} \e$B$K$h$k=pL>\e(B/\e$B0E9f\e(B
+\e$B2=$N=hM}$r<B9T$7$^$9!#\e(BOpenSSL \e$B$O\e(B @uref{http://www.openssl.org/} \e$B$G8+$D$+\e(B
+\e$B$k$G$7$g$&!#\e(BOpenSSL 0.9.6 \e$B0J9_$N$b$N$,F0:n$9$k$O$:$G$9!#%P!<%8%g\e(B
+\e$B%s\e(B 0.9.5a \e$B$O>ZL@=q$+$i%a!<%k%"%I%l%9$rCj=P$9$k$3$H$,$G$-$^$;$s!#$^$?$=$l\e(B
+\e$B$O\e(B @acronym{MIME} \e$B$N%;%Q%l!<%?$KM>7W$J\e(B CR \e$BJ8;z$rA^F~$9$k$N$G!"JQ$J%a!<%k\e(B
+\e$B$rAw$k?M$@$H;W$o$l$?$/$J$1$l$P!"$=$l$r;H$&$3$H$rHr$1$?$$$G$7$g$&!#\e(B(\e$B$b$C\e(B
+\e$B$H$b$"$J$?$O\e(B @acronym{S/MIME} \e$B$N%a%C%;!<%8$rAw$C$?;~E@$G!"$*$=$i$/$=$NJQ\e(B
+\e$B?M%3%s%F%9%H$G$N>!Mx$rF($7$F$7$^$$$^$7$?$,!#\e(B)
+
+\e$B0E9f2=$5$l$?%a!<%k$rAw$k$?$a$K8D?M$N>ZL@=q$OMW$j$^$;$s!#$b$C$H$b\e(B Message
+(@acronym{MML}) \e$B$O!"DL?.$7$?$$Aj<j$N?M$N>ZL@=q$rI,MW$H$7$^$9$1$l$I!#$3$l\e(B
+\e$B$O\e(B @kbd{C-c C-m c s} \e$B$r%?%$%W$7$?$H$-$K?R$M$i$l$^$9!#:#$N$H$3$m!">ZL@=q\e(B
+\e$B$r%m!<%+%k%U%!%$%k$+$i<h$j=P$9$+\e(B DNS \e$B$+$i<h$j4s$;$k$+$N!"Fs$D$NJ}K!$,$"\e(B
+\e$B$j$^$9!#%m!<%+%k%U%!%$%k$rA*Br$7$?>l9g!"$=$l$O\e(B @acronym{PEM} \e$B7A<0$K$h\e(B
 \e$B$k\e(B X.509 \e$B>ZL@=q$r4^$s$G$$$kI,MW$,$"$j$^$9!#\e(BDNS \e$B$rA*$s$@>l9g$K$O!"$=$N>Z\e(B
 \e$BL@=q$,3JG<$5$l$F$$$k%I%a%$%sL>$r?R$M$i$l$^$9\e(B (\e$B%G%#%U%)%k%H$O>e<j$K?dB,$7\e(B
-\e$B$?$b$N$G$9\e(B)\e$B!#;d$,?.$8$k8B$j!"\e(B
-Message (@acronym{MML}) \e$B$O\e(B @acronym{S/MIME} \e$B$N>ZL@=q$r\e(B DNS \e$B$+$i<h$j4s$;\e(B
-\e$B$k@$3&=i$N%a!<%k!&%(!<%8%'%s%H$J$N$G!"$=$3$GHs>o$KB?$/$N>ZL@=q$r8+$D$1=P\e(B
-\e$B$9$3$H$O$J$$$G$7$g$&!#>/$J$/$H$b0l$D$@$1$O!"\e(B
-@code{simon.josefsson.org} \e$B%I%a%$%s$K3JG<$5$l$?$b$N$,$"$k$O$:$G$9!#\e(B
-LDAP \e$B$O$b$C$HIa5Z$7$F$$$k>ZL@=q$rG[5k$9$k<jK!$G!"$=$l$r%5%]!<%H$9$k$3$H\e(B
-\e$B$,7W2h$5$l$F$$$^$9!#\e(B(\e$BOCJQ$o$C$F!"\e(B@code{ldapsearch} \e$B$r%3%^%s%I%i%$%s$+$i\e(B
-\e$B<B9T$7$F>ZL@=q$r%U%!%$%k$K<h$j9~$s$G!"$=$l$r;H$&$3$H$,$G$-$^$9!#\e(B)
+\e$B$?$b$N$G$9\e(B)\e$B!#;d$,?.$8$k8B\e(B
+\e$B$j\e(B Message (@acronym{MML}) \e$B$O\e(B @acronym{S/MIME} \e$B$N>ZL@=q$r\e(B DNS \e$B$+$i<h$j4s\e(B
+\e$B$;$k@$3&=i$N%a!<%k!&%(!<%8%'%s%H$J$N$G!"$"$^$j$?$/$5$s$N>ZL@=q$,$=$3$G8+\e(B
+\e$B$D$+$k$3$H$OL5$$$G$7$g$&!#>/$J$/$H$b0l$D$@$1\e(B
+\e$B$O\e(B @code{simon.josefsson.org} \e$B%I%a%$%s\e(B (\e$BLuCm\e(B: \e$B86Cx<T$N%5%$%H\e(B) \e$B$K3JG<$5$l\e(B
+\e$B$?$b$N$,$"$k$O$:$G$9$,!#\e(BLDAP \e$B$O>ZL@=q$rG[5k$9$k$?$a$N$b$C$HIa5Z$7$F$$$k\e(B
+\e$B<jK!$G!"$=$l$r%5%]!<%H$9$k$3$H$,7W2h$5$l$F$$$^$9!#\e(B(\e$BOC$OJQ$o$j$^$9$,!"\e(B
+@code{ldapsearch} \e$B$r%3%^%s%I%i%$%s$+$i<B9T$7$F>ZL@=q$r%U%!%$%k$K<h$j9~$_!"\e(B
+\e$B$=$l$r;H$&$3$H$,$G$-$^$9$h!#\e(B)
 
 \e$B%a%C%;!<%8$N=pL>$K$D$$$F$O!"$"$k<o$N@_DjL5$7$G$O\e(B OpenSSL \e$B$O=pL>$N=hM}$r\e(B
 \e$B<B9T$9$k$3$H$,$G$-$^$;$s!#$H$j$o$1!"$"$J$?$NHkL)80\e(B (private key) \e$B$H>ZL@\e(B
 \e$B=q$,$I$3$K3JG<$5$l$F$$$k$+$r65$($F$"$2$kI,MW$,$"$j$^$9!#\e(B@acronym{MML} \e$B$O\e(B
-\e$B$=$NL>$K$U$5$o$7$$\e(B @code{smime.el} \e$B$H$$$&\e(B Emacs \e$B%$%s%?!<%U%'!<%9\e(B
-\e$B$r\e(B OpenSSL \e$B$KBP$7$F;H$$!"$=$l$O$3$N@_Dj$K;H$&$?$a$N$?$a\e(B
-\e$B$N\e(B @code{custom} \e$B%0%k!<%W$r4^$s$G$$$^$9!#$G$9$+$i!"\e(B
-@kbd{M-x customize-group RET smime RET} \e$B$r;n$7$F!"D/$a$F$_$F2<$5$$!#\e(B
-
-\e$B8=:_$O!"\e(BCA (\e$B$^$?$O\e(B RA) \e$B$HDL?.$7$F$"$J$?<+?H$N>ZL@=q$r@8@.$9$k$?$a$N%5%]!<\e(B
-\e$B%H$O$"$j$^$;$s!#$=$l$K7W2h$b$"$j$^$;$s!#;d$O\e(B Netscape \e$B$r;H$C$F!"%M%C%H>e\e(B
-\e$B$K$"$kBg$-$J\e(B CA \e$B$N0l$D$+$i!"L5NA$N\e(B @acronym{S/MIME} \e$B$N>ZL@=q$r$b$i$$$^$7\e(B
+\e$B$=$NL>$K$U$5$o$7$$\e(B @code{smime.el} \e$B$H$$$&\e(B OpenSSL \e$B$X$N\e(B Emacs \e$B%$%s%?!<%U%'!<\e(B
+\e$B%9$r;H$$$^$9$,!"$=$l$O$3$N@_Dj$K;H$&$?$a$N$?$a$N\e(B @code{custom} \e$B%0%k!<%W\e(B
+\e$B$r;}$C$F$$$^$9!#$G$9$+$i\e(B @kbd{M-x customize-group RET smime RET} \e$B$r;n$7\e(B
+\e$B$F!"D/$a$F$_$F2<$5$$!#\e(B
+
+\e$B8=:_$O!"\e(BCA (\e$B$^$?$O\e(B RA) \e$B$HDL?.$7$F$"$J$?<+?H$N>ZL@=q$r@8@.$9$k$3$H$O%5%]!<\e(B
+\e$B%H$5$l$F$$$^$;$s!#$=$l$K7W2h$b$"$j$^$;$s!#;d$O\e(B Netscape \e$B$r;H$C$F!"%M%C%H\e(B
+\e$B>e$K$"$kBg$-$J\e(B CA \e$B$N0l$D$+$iL5NA$N\e(B @acronym{S/MIME} \e$B$N>ZL@=q$r$b$i$$$^$7\e(B
 \e$B$?!#\e(BNetscape \e$B$OHkL)80$H>ZL@=q$r\e(B PKCS #12 \e$B7A<0$GM"=P\e(B (export) \e$B$9$k$3$H$,\e(B
-\e$B$G$-$^$9!#\e(BOpenSSL \e$B$r;H$C$F!"$3$l$r0J2<$N$h$&$K\e(B PEM \e$B7A<0$K$h$kAG\e(B
-\e$B$N\e(B (plain) X.509 \e$B>ZL@=q$KJQ49$7$F2<$5$$!#\e(B
+\e$B$G$-$^$9!#\e(BOpenSSL \e$B$r;H$C$F!"$3$l$r0J2<$N$h$&$K\e(B PEM \e$B7A<0$K$h$k\e(B
+\e$BAG\e(B (plain) \e$B$N\e(B X.509 \e$B>ZL@=q$KJQ49$7$F2<$5$$!#\e(B
 
 @example
 $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
 @end example
 
-@code{smime-keys} \e$BJQ?t$,!"\e(B@file{key+cert.pem} \e$B%U%!%$%k$r;X$7<($9$h$&$K$7\e(B
-\e$B$J$1$l$P$J$j$^$;$s!#:#$d$"$J$?$O!"=pL>$5$l$?%a%C%;!<%8$rAw?.$G$-$k$O$:$G\e(B
+@code{smime-keys} \e$BJQ?t$,\e(B @file{key+cert.pem} \e$B%U%!%$%k$r;X$7<($9$h$&$K$7\e(B
+\e$B$J$1$l$P$J$j$^$;$s!#:#$d!"$"$J$?$O=pL>$5$l$?%a%C%;!<%8$rAw?.$G$-$k$O$:$G\e(B
 \e$B$9!#\e(B
 
 @emph{\e$BCm0U\e(B!}  \e$B$"$J$?$N80$O:#!"0E9f2=$5$l$:$K%U%!%$%k$K3JG<$5$l$?$N$G!"$=\e(B
-\e$B$l$N07$$$K$O5$$rIU$1$F2<$5$$!#0E9f2=$5$l$?80$N%U%!%$%k$X$N3JG<$O%5%]!<%H\e(B
-\e$B$5$l$F$$$F!"$=$N>l9g$O\e(B OpenSSL \e$B$r:nF0$9$kA0$K\e(B Gnus \e$B$,%Q%9%U%l!<%:$r?R$M\e(B
-\e$B$k$G$7$g$&!#$I$&$d$C$F$=$l$r@.$7?k$2$k$+$K$D$$$F$O!"\e(BOpenSSL \e$B$N%I%-%e%a%s\e(B
-\e$B%H$rFI$s$G2<$5$$!#0E9f2=$5$l$F$$$J$$80$r;H$&\e(B (\e$BNc$($P$=$l$i$,0BA4$J%9%H%l!<\e(B
-\e$B%8$K$"$k!"$^$?$O!"$"$J$?$,0BA4$J%7%s%0%k!&MxMQ<T$N%^%7%s$K$$$k\e(B) \e$B$N$G$"$l\e(B
-\e$B$P!"%Q%9%U%l!<%:$NF~NO$rMW5a$5$l$?$H$-!"C1$K\e(B @kbd{RET} \e$B$r2!$7$F2<$5$$!#\e(B
+\e$B$l$N07$$$K$O5$$rIU$1$F2<$5$$!#0E9f2=$5$l$?80$r%U%!%$%k$K3JG<$9$k5!G=$O%5\e(B
+\e$B%]!<%H$5$l$F$$$^$9!#$=$N>l9g$O\e(B OpenSSL \e$B$r8F$S=P$9A0$K\e(B Gnus \e$B$,%Q%9%U%l!<\e(B
+\e$B%:$r?R$M$k$G$7$g$&!#$I$&$d$C$F$=$l$r@.$7?k$2$k$+$K$D$$$F$O\e(B OpenSSL \e$B$N%I\e(B
+\e$B%-%e%a%s%H$rFI$s$G2<$5$$!#0E9f2=$5$l$F$$$J$$80$r;H$&\e(B (\e$BNc$($P$=$l$i$,0BA4\e(B
+\e$B$J%9%H%l!<%8$K$"$k!"$^$?$O$"$J$?$,0BA4$J%7%s%0%k!&MxMQ<T$N%^%7%s$K$$\e(B
+\e$B$k\e(B) \e$B$N$G$"$l$P!"%Q%9%U%l!<%:$NF~NO$rMW5a$5$l$?$H$-!"C1$K\e(B @kbd{RET} \e$B$r2!\e(B
+\e$B$7$F2<$5$$!#\e(B
 
 @subsection PGP/MIME \e$B$r;H$&\e(B
 
@@ -1043,22 +1051,22 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
 
 @vindex gpg-temp-directory
 \e$BCm\e(B: \e$B$b$7\e(B @code{gpg.el} \e$B$r;H$&$N$G$"$l$P!"\e(B@code{gpg-temp-directory} \e$B$G;X\e(B
-\e$BDj$5$l$k%G%#%l%/%H%j!<$N%Q!<%_%C%7%g%s$,\e(B 0700 \e$B$K$J$C$F$$$k$3$H$r3NG'$7$F\e(B
+\e$BDj$5$l$k%G%#%l%/%H%j!<$N%Q!<%_%C%7%g%s$,I,$:\e(B 0700 \e$B$K$J$C$F$$$k$h$&$K$7$F\e(B
 \e$B2<$5$$!#\e(B
 
 \e$B$"$J$?$N\e(B PGP \e$B$N<BAu$N%I%-%e%a%s%H$G>\$7$/=R$Y$i$l$F$$$k$N$G!"$"$J$?<+?H\e(B
 \e$B$N$?$a$N80$N@8@.$N$7$+$?$O!"$=$l$K>y$j$^$9!#\e(B
 
 \e$B$b$7$"$J$?$,8E$$\e(B PGP 2.x \e$B$N80$r\e(B GnuPG \e$B$KM"F~$7$F$"$C$F!"\e(BPGP 2.x \e$B$r;H$C$F\e(B
-\e$B$$$kAj<j$K=pL>$5$l$+$D0E9f2=$5$l$?%a%C%;!<%8$rAw$j$?$$$H$9$k$H!"<u?.<T$O\e(B
+\e$B$$$kCg4V$K=pL>$5$l$+$D0E9f2=$5$l$?%a%C%;!<%8$rAw$j$?$$$H$9$k$H!"<u?.<T$O\e(B
 \e$B$"$J$?$,Aw?.$7$?$b$N$rM}2r$G$-$J$$$3$H$rH/8+$9$k$3$H$K$J$k$G$7$g$&!#0l$D\e(B
 \e$B$N2r$O!"Be$o$j$K\e(B PGP 2.x \e$B$r;H$&$3$H\e(B (\e$B$9$J$o$A!"$b$7\e(B @code{pgg} \e$B$r;H$C$F\e(B
 \e$B$$$k$N$G$"$l$P!"\e(B@code{pgg-default-scheme} \e$B$r\e(B @code{pgp} \e$B$K@_Dj$9$k$3\e(B
-\e$B$H\e(B) \e$B$G$9!#\e(BGnuPG \e$B$r;H$$$?$/$J$$$N$G$"$l$P!"\e(B@code{gpg-2comp} \e$B$H$$$&8_49@-\e(B
-\e$B$,$"$k%9%/%j%W%H\e(B
-\e$B$r\e(B @uref{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/} \e$B$rF~<j\e(B
-\e$B$7$F!";H$&$3$H$,$G$-$^$9!#\e(BPGP 2.x \e$B$r;H$C$F$$$kAj<j$N?M$K!"\e(BGnuPG \e$B$K>h$j49\e(B
-\e$B$($k$3$H$rG<F@$5$;$k$3$H$b$G$-$k$G$7$g$&!#\e(B
+\e$B$H\e(B) \e$B$G$9!#\e(BGnuPG \e$B$r;H$$$?$$$N$G$"$l$P!"\e(B@code{gpg-2comp} \e$B$H$$$&8_49$r<B8=\e(B
+\e$B$9$k%9%/%j%W\e(B
+\e$B%H\e(B @uref{http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp/} \e$B$rF~<j\e(B
+\e$B$7$F!";H$&$3$H$,$G$-$^$9!#$5$i$K\e(B PGP 2.x \e$B$r;H$C$F$$$kCg4V$K!"\e(BGnuPG \e$B$K>h\e(B
+\e$B$j49$($k$3$H$r@bF@$7$F$bNI$$$G$7$g$&!#\e(B
 @vindex mml-signencrypt-style-alist
 \e$B:G8e$NBeBX<jCJ$H$7$F!"=pL>$H0E9f2=$NF0:n$rFsCJ3,\e(B (\e$BJ,N%=pL>$7$F$+$i%a%C%;!<\e(B
 \e$B%8$r0E9f2=$9$k\e(B) \e$B$K$9$k$3$H$,$G$-$^$9!#$3$N?6$kIq$$$rJQ99$7$?$$$N$G$"$l$P!"\e(B
@@ -1072,64 +1080,65 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
                                     ("pgpmime" separate)))
 @end lisp
 
-\e$B$3$l$O=pL>$H0E9f2=$rFs%Q%9$G9T$J$o$;$k$3$H$K$h$C$F!"\e(BPGP version 2 \e$B$,M}2r\e(B
-\e$B$G$-$k%a%C%;!<%8$N@8@.$r$b$?$i$7$^$9!#\e(B
+\e$B$3$l$O=pL>$H0E9f2=$rFsCJ3,$G9T$J$o$;$k$3$H$K$h$C$F!"\e(BPGP version 2 \e$B$,M}2r\e(B
+\e$B$G$-$k%a%C%;!<%8$r@8@.$7$^$9!#\e(B
 
-(\e$B$=$NLdBj$K4X$9$k$5$i$J$k>pJs$K$D$$$F!"\e(B
+(\e$B$=$NLdBj$K4X$9$k$5$i$J$k>pJs$K$D$$$F$O!"\e(B
 @uref{http://www.gnupg.org/gph/en/pgp2x.html} \e$B$r;2>H$7$F2<$5$$!#\e(B)
 
 @node Various Commands
 @section \e$B$$$m$$$m$JL?Na\e(B
 
 @table @kbd
-
 @item C-c C-r
 @kindex C-c C-r
 @findex message-caesar-buffer-body
-\e$B8=:_$N%a%C%;!<%8$r%7!<%6!<JQ49\e(B (\e$BJLL>\e(B rot13) \e$B$7$^\e(B
-\e$B$9\e(B (@code{message-caesar-buffer-body})\e$B!#$b$7HO0O8BDj$,<B9T$5$l$F$$$?$i!"\e(B
-\e$B%P%C%U%!!<$N8+$($kItJ,$@$1$rJQ49$7$^$9!#?tCM@\F,0z?t$OJ8$r$I$N$/$i$$2sE>\e(B
-\e$B$5$;$k$+$r;XDj$7$^$9!#%G%#%U%)%k%HCM$O\e(B 13 \e$B$G$9!#\e(B
+\e$B8=:_$N%a%C%;!<%8$r%+%(%5%kJQ49\e(B (\e$BJLL>\e(B rot13) \e$B$7$^\e(B
+\e$B$9\e(B (@code{message-caesar-buffer-body})\e$B!#$"$kHO0O$K%P%C%U%!!<$,69$a$i$l$F\e(B
+\e$B$$$?>l9g$O!"%P%C%U%!!<$N8+$($kItJ,$@$1$rJQ49$7$^$9!#?tCM@\F,0z?t$OJ8Cf$N\e(B
+\e$B%"%k%U%!%Y%C%H$r2?J8;zJ,2sE>$5$;$k$+$r;XDj$7$^$9!#%G%#%U%)%k%H$O\e(B 13 \e$B$G$9!#\e(B
 
 @item C-c C-e
 @kindex C-c C-e
 @findex message-elide-region
 @vindex message-elide-ellipsis
-\e$B%]%$%s%H$H%^!<%/$N4V$NJ8$r>J$-$^$9\e(B (@code{message-elide-region})\e$B!#J8>O$O\e(B
-\e$B@Z$i$l$F\e(B (killed) \e$BJQ?t\e(B @code{message-elide-ellipsis} \e$B$NCM$GCV$-49$($i$l\e(B
-\e$B$^$9!#%G%#%U%)%k%H$N>JN,Id9f$H$7$F;H$o$l$kCM$O\e(B (@samp{[...]}) \e$B$G$9!#\e(B
+\e$B%]%$%s%H$H%^!<%/$N4V$NJ8$r>JN,$7$^$9\e(B (@code{message-elide-region})\e$B!#J8>O\e(B
+\e$B$O\e(B kill \e$B$5$l$F!"JQ?t\e(B @code{message-elide-ellipsis} \e$B$NCM$GCV$-49$($i$l$^\e(B
+\e$B$9!#%G%#%U%)%k%H$N>JN,Id9f$H$7$F;H$o$l$kCM$O\e(B (@samp{[...]}) \e$B$G$9!#\e(B
 
 @item C-c M-k
 @kindex C-c M-k
 @findex message-kill-address
-\e$B8=:_0LCV$N%"%I%l%9$r:o=|$7$^$9!#\e(B
+\e$B8=:_0LCV$N%"%I%l%9$r:o=|$7$^$9\e(B (\e$BLuCm\e(B: \e$B$3$N%3%^%s%I$O:n<T$d=P$I$3$m$,ITL@\e(B
+\e$B$G!"$5$i$K0-$$$3$H$KIT40A4$J%3%^%s%I$K8+$($^$9!#I,$:>C$7$?$$%"%I%l%9$N@h\e(B
+\e$BF,$K%]%$%s%H$rCV$$$F;H$C$F2<$5$$!#\e(B)
 
 @item C-c C-z
-@kindex C-c C-x
+@kindex C-c C-z
 @findex message-kill-to-signature
-\e$B=pL>$^$G$+!"$=$l$,L5$1$l$P5-;v$N:G8e$^$G$N$9$Y$F$NJ8$r@Z$j$^\e(B
+\e$B8=:_0LCV$+$i=pL>$^$G!"$^$?$O$=$l$,L5$1$l$P5-;v$N:G8e$^$G$NJ8$r\e(B kill \e$B$7$^\e(B
 \e$B$9\e(B (@code{message-kill-to-signature})\e$B!#\e(B
 
 @item C-c C-v
 @kindex C-c C-v
 @findex message-delete-not-region
-\e$B%a%C%;!<%8$NK\J8$N%j!<%8%g%s$N30$N$9$Y$F$NJ8$r>C5n$7$^\e(B
+\e$B%a%C%;!<%8$NK\J8$K$*$$$F!"NN0h$,@_Dj$5$l$?>l=j0J30$N$9$Y$F$NJ8$r>C5n$7$^\e(B
 \e$B$9\e(B (@code{message-delete-not-region})\e$B!#\e(B
 
 @item M-RET
 @kindex M-RET
 @findex message-newline-and-reformat
-\e$B;M$D$N?7$7$$9T$rA^F~$7!"$b$7%]%$%s%H$,0zMQJ8$N4V$K$"$k$J$i$P!":F@07A$7$^\e(B
-\e$B$9!#\e(B
+\e$B;MK\$N6u9T$rA^F~$7$^$9!#$=$7$F!"$b$7%]%$%s%H$,0zMQJ8$NCf4V$K$"$C$?$N$J$i\e(B
+\e$B$P!"0zMQJ8$r@07A$7D>$7$^$9!#\e(B
 
-\e$B$3$l$ONc$G$9\e(B:
+\e$BNc$G$9\e(B:
 
 @example
 > \e$B$3$l$O2?$+$N0zMQJ8$G$9!#\e(B \e$B$=$7$F!"$3$3$K$O$b$C$H0zMQJ8$,$"$j$^$9!#\e(B
 @end example
 
-\e$B$b$7!"%]%$%s%H$,\e(B @samp{\e$B$=$7$F\e(B} \e$B$NA0$K$"$j!"\e(B@kbd{M-RET} \e$B$r2!$7$?$J$i!"0J\e(B
-\e$B2<$N$h$&$J$b$N$rF@$^$9\e(B:
+\e$B%]%$%s%H$,!V$=$7$F!W$NA0$K$"$k$H$-$K\e(B @kbd{M-RET} \e$B$r2!$9$H!"0J2<$N$h$&$K\e(B
+\e$B$J$j$^$9\e(B:
 
 @example
 > \e$B$3$l$O2?$+$N0zMQJ8$G$9!#\e(B
@@ -1139,20 +1148,20 @@ $ openssl pkcs12 -in ns.p12 -clcerts -nodes > key+cert.pem
 > \e$B$=$7$F!"$3$3$K$O$b$C$H0zMQJ8$,$"$j$^$9!#\e(B
 @end example
 
-@samp{*} \e$B$O%]%$%s%H$,CV$+$l$F$$$k>l=j$G$9!#\e(B
+@samp{*} \e$B$O%]%$%s%H$,CV$+$l$k>l=j$G$9!#\e(B
 
 @item C-c M-r
 @kindex C-c M-r
 @findex message-rename-buffer
 \e$B%P%C%U%!!<$NL>A0$rJQ99$7$^$9\e(B (@code{message-rename-buffer})\e$B!#@\F,0z?t$,\e(B
-\e$BM?$($i$l$k$H!"?7$7$$%P%C%U%!!<L>$NF~NO$rB%?J$7$^$9!#\e(B
+\e$BM?$($i$l$k$H!"?7$7$$%P%C%U%!!<L>$NF~NO$rMW5a$7$^$9!#\e(B
 
 @item TAB
 @kindex TAB
 @findex message-tab
 @vindex message-tab-body-function
-@code{message-tab-body-function} \e$B$K@_Dj$5$l$F$$$k4X?t$r<B9T$7$^$9!#$5$b\e(B
-\e$B$J$1$l$P\e(B (\e$B$=$l$,\e(B @code{nil} \e$B$@$C$?$i\e(B)\e$B!"\e(B
+@code{message-tab-body-function} \e$B$,\e(B @code{nil} \e$B$G$J$+$C$?$i!"$=$l$,;XDj\e(B
+\e$B$9$k4X?t$r<B9T$7$^$9!#$5$b$J$1$l$P!"\e(B
 @code{text-mode-map} \e$B$+\e(B @code{global-map} \e$B$N\e(B @kbd{TAB} \e$B%-!<$K3d$jEv$F$i\e(B
 \e$B$l$F$$$k%3%^%s%I$r;H$$$^$9!#\e(B
 @end table
@@ -1292,7 +1301,6 @@ Message \e$B$O%a%C%;!<%8:n@.ItJ,$K4X$7$F$OHs>o$K@Q6KE*$G$9!#$=$l$O<!$N$h$&$G\e(B
 \e$B@=$,==J,$KF1$8$h$&$K8+$($k$h$&$K!"$9$Y$F$N%X%C%@!<$r$=$l<+?H$G:n@.$7$^$9!#\e(B
 
 @table @code
-
 @item message-generate-headers-first
 @vindex message-generate-headers-first
 @code{t} \e$B$J$i$P!"%a%C%;!<%8$N:n@.$r;O$a$kA0$K$9$Y$F$NI,MW$J%X%C%@!<$r:n\e(B
@@ -1563,7 +1571,6 @@ message/partial \e$B$H$7$FAw?.$5$l$k%a%C%;!<%8$N@)8B!#\e(B
 \e$B$rB%?J$7$^$9!#0J2<$N%7%s%\%k$,;H$($^$9\e(B:
 
 @table @code
-
 @item From
 @cindex From
 @findex user-full-name
@@ -1671,7 +1678,6 @@ message/partial \e$B$H$7$FAw?.$5$l$k%a%C%;!<%8$N@)8B!#\e(B
 \e$B=P$F9T$/%K%e!<%95-;v$r%+%9%?%^%$%:$9$k$?$a$NB>$NJQ?t\e(B:
 
 @table @code
-
 @item message-syntax-checks
 @vindex message-syntax-checks
 @code{nil} \e$B$G$J$1$l$P!"\e(BMessage \e$B$OEj9F$NA0$K!"%X%C%@!<$HB>$N$b$N$N9gK!@-\e(B
@@ -2035,7 +2041,6 @@ Emacs \e$B$O%a%C%;!<%8:n@.$r$$$m$$$m$K2u$7$F$7$^$&$3$H$,$G$-$kB?$/$N%F%-%9%H\e(B
 @section \e$BAw$k$?$a$NJQ?t\e(B
 
 @table @code
-
 @item message-fcc-handler-function
 @vindex message-fcc-handler-function
 \e$B=P$F$$$/5-;v$rJ]B8$9$k$?$a$K8F$P$l$k4X?t$G$9!#$3$N4X?t$O5-;v$r3JG<$9$k$?\e(B
@@ -2241,7 +2246,6 @@ Message \e$B$O;v<B>e!"$=$l<+?H$NJQ?t$7$+;H$$$^$;$s\e(B---\e$B8E$$\e(B @code{mail-} \e
 \e$B7hDj$7$^$9\e(B:
 
 @table @code
-
 @item Followup-To
 
 @item Newsgroups