merge from semi-1_14 branch

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index ba407c4..5868fd0 100644 (file)
--- a/mime-ui-en.sgml
+++ b/mime-ui-en.sgml
@@ -129,14 +129,14 @@ C-c C-x C-y       insert a mail or news message.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.

-C-c C-x a      enclose as multipart/alternative.
-C-c C-x p      enclose as multipart/parallel.
-C-c C-x m      enclose as multipart/mixed.
-C-c C-x d      enclose as multipart/digest.
-C-c C-x s      enclose as PGP signed.
-C-c C-x e      enclose as PGP encrypted.
+C-c C-m C-a    enclose as multipart/alternative.
+C-c C-m C-p    enclose as multipart/parallel.
+C-c C-m C-m    enclose as multipart/mixed.
+C-c C-m C-d    enclose as multipart/digest.
+C-c C-m C-s    enclose as PGP signed.
+C-c C-m C-e    enclose as PGP encrypted.

 C-c C-x C-k    insert PGP public key.
 C-c C-x C-k    insert PGP public key.

-C-c C-x C-p    preview editing MIME message.
+C-c C-x p      preview editing MIME message.

 ...
 
 therefore, you should type C-c C-x C-i and specify the binary file
 ...
 
 therefore, you should type C-c C-x C-i and specify the binary file

@@ -397,27 +397,27 @@ Operations to make enclosure are following:
 <kd>
 Enclose specified region as multipart/alternative.
 </kd>
 <kd>
 Enclose specified region as multipart/alternative.
 </kd>

-<kt>C-c C-x C-p
+<kt>C-c C-m C-p

 <kd>
 Enclose specified region as multipart/parallel.
 </kd>
 <kd>
 Enclose specified region as multipart/parallel.
 </kd>

-<kt>C-c C-x C-m
+<kt>C-c C-m C-m

 <kd>
 Enclose specified region as multipart/mixed.
 </kd>
 <kd>
 Enclose specified region as multipart/mixed.
 </kd>

-<kt>C-c C-x C-d
+<kt>C-c C-m C-d

 <kd>
 Enclose specified region as multipart/digest.
 </kd>
 <kd>
 Enclose specified region as multipart/digest.
 </kd>

-<kt>C-c C-x C-s
+<kt>C-c C-m C-s

 <kd>
 Digital-sign to specified region. <cf node="PGP">
 </kd>
 <kd>
 Digital-sign to specified region. <cf node="PGP">
 </kd>

-<kt>C-c C-x C-e
+<kt>C-c C-m C-e

 <kd>
 Encrypt to specified region. <cf node="PGP">
 </kd>
 <kd>
 Encrypt to specified region. <cf node="PGP">
 </kd>

-<kt>C-c C-x C-q
+<kt>C-c C-m C-q

 <kd>
 avoid to encode tags in specified region.  In other words, tags is
 interpreted as such string.  (In current version, it may be
 <kd>
 avoid to encode tags in specified region.  In other words, tags is
 interpreted as such string.  (In current version, it may be

diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index e8e4fd0..7271050 100644 (file)
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -145,14 +145,14 @@ C-c C-x C-y       insert a mail or news message.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.

-C-c C-x a      enclose as multipart/alternative.
-C-c C-x p      enclose as multipart/parallel.
-C-c C-x m      enclose as multipart/mixed.
-C-c C-x d      enclose as multipart/digest.
-C-c C-x s      enclose as PGP signed.
-C-c C-x e      enclose as PGP encrypted.
+C-c C-m C-a    enclose as multipart/alternative.
+C-c C-m C-p    enclose as multipart/parallel.
+C-c C-m C-m    enclose as multipart/mixed.
+C-c C-m C-d    enclose as multipart/digest.
+C-c C-m C-s    enclose as PGP signed.
+C-c C-m C-e    enclose as PGP encrypted.

 C-c C-x C-k    insert PGP public key.
 C-c C-x C-k    insert PGP public key.

-C-c C-x C-p    preview editing MIME message.
+C-c C-x p      preview editing MIME message.

 ...
 
 therefore, you should type C-c C-x C-i and specify the binary file
 ...
 
 therefore, you should type C-c C-x C-i and specify the binary file

@@ -453,22 +453,22 @@ Operations to make enclosure are following:
 @item @key{C-c C-m C-a}
 Enclose specified region as multipart/alternative.
 
 @item @key{C-c C-m C-a}
 Enclose specified region as multipart/alternative.
 

-@item @key{C-c C-x C-p}
+@item @key{C-c C-m C-p}

 Enclose specified region as multipart/parallel.
 
 Enclose specified region as multipart/parallel.
 

-@item @key{C-c C-x C-m}
+@item @key{C-c C-m C-m}

 Enclose specified region as multipart/mixed.
 
 Enclose specified region as multipart/mixed.
 

-@item @key{C-c C-x C-d}
+@item @key{C-c C-m C-d}

 Enclose specified region as multipart/digest.
 
 Enclose specified region as multipart/digest.
 

-@item @key{C-c C-x C-s}
+@item @key{C-c C-m C-s}

 Digital-sign to specified region. (cf. @ref{PGP})
 
 Digital-sign to specified region. (cf. @ref{PGP})
 

-@item @key{C-c C-x C-e}
+@item @key{C-c C-m C-e}

 Encrypt to specified region. (cf. @ref{PGP})
 
 Encrypt to specified region. (cf. @ref{PGP})
 

-@item @key{C-c C-x C-q}
+@item @key{C-c C-m C-q}

 avoid to encode tags in specified region.  In other words, tags is
 interpreted as such string.  (In current version, it may be
 incomplete.  Maybe PGP-signature does not work for this enclosure.)
 avoid to encode tags in specified region.  In other words, tags is
 interpreted as such string.  (In current version, it may be
 incomplete.  Maybe PGP-signature does not work for this enclosure.)

diff --git a/mime-ui-ja.sgml b/mime-ui-ja.sgml
index 8e0db7d..e1656a0 100644 (file)
--- a/mime-ui-ja.sgml
+++ b/mime-ui-ja.sgml
@@ -125,14 +125,14 @@ C-c C-x C-y       insert a mail or news message.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.

-C-c C-x a      enclose as multipart/alternative.
-C-c C-x p      enclose as multipart/parallel.
-C-c C-x m      enclose as multipart/mixed.
-C-c C-x d      enclose as multipart/digest.
-C-c C-x s      enclose as PGP signed.
-C-c C-x e      enclose as PGP encrypted.
+C-c C-m C-a    enclose as multipart/alternative.
+C-c C-m C-p    enclose as multipart/parallel.
+C-c C-m C-m    enclose as multipart/mixed.
+C-c C-m C-d    enclose as multipart/digest.
+C-c C-m C-s    enclose as PGP signed.
+C-c C-m C-e    enclose as PGP encrypted.

 C-c C-x C-k    insert PGP public key.
 C-c C-x C-k    insert PGP public key.

-C-c C-x C-p    preview editing MIME message.
+C-c C-x p      preview editing MIME message.

 ...
 
 \e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B
 ...
 
 \e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B

@@ -401,26 +401,26 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/alternative \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/alternative \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>

-<kt>C-c C-x C-p
+<kt>C-c C-m C-p

 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/parallel \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/parallel \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>

-<kt>C-c C-x C-m
+<kt>C-c C-m C-m

 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/mixed \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/mixed \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>

-<kt>C-c C-x C-d
+<kt>C-c C-m C-d

 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 </kd>

-<kt>C-c C-x C-s
+<kt>C-c C-m C-s

 <kd>
 \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B<cf node="PGP">
 </kd>
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B<cf node="PGP">
 </kd>

-<kt>C-c C-x C-e
+<kt>C-c C-m C-e

 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B<cf node="PGP">
 <kd>
 \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B<cf node="PGP">

-<kt>C-c C-x C-q
+<kt>C-c C-m C-q

 <kd>
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
 \e$B$h$&$K$7$^$9!#!J8=:_$NHG$G$O$&$^$/F/$+$J$$$3$H$,$"$j$^$9!#$^$?!"EE;R=p\e(B
 <kd>
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
 \e$B$h$&$K$7$^$9!#!J8=:_$NHG$G$O$&$^$/F/$+$J$$$3$H$,$"$j$^$9!#$^$?!"EE;R=p\e(B

diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 79523f0..8fe71de 100644 (file)
--- a/mime-ui-ja.texi
+++ b/mime-ui-ja.texi
@@ -141,14 +141,14 @@ C-c C-x C-y       insert a mail or news message.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.
 C-c C-x RET    insert a mail message.
 C-c C-x C-s    insert a signature file at end.
 C-c C-x t      insert a new MIME tag.

-C-c C-x a      enclose as multipart/alternative.
-C-c C-x p      enclose as multipart/parallel.
-C-c C-x m      enclose as multipart/mixed.
-C-c C-x d      enclose as multipart/digest.
-C-c C-x s      enclose as PGP signed.
-C-c C-x e      enclose as PGP encrypted.
+C-c C-m C-a    enclose as multipart/alternative.
+C-c C-m C-p    enclose as multipart/parallel.
+C-c C-m C-m    enclose as multipart/mixed.
+C-c C-m C-d    enclose as multipart/digest.
+C-c C-m C-s    enclose as PGP signed.
+C-c C-m C-e    enclose as PGP encrypted.

 C-c C-x C-k    insert PGP public key.
 C-c C-x C-k    insert PGP public key.

-C-c C-x C-p    preview editing MIME message.
+C-c C-x p      preview editing MIME message.

 ...
 
 \e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B
 ...
 
 \e$B$C$FLu$G!"\e(BC-c C-x C-i \e$B$r2!$7$F!"A^F~$7$?$$\e(B binary file \e$B$r;XDj$7$^$9!#\e(B

@@ -455,22 +455,22 @@ enclosure \e$B$r:n$k$?$a$NA`:n$H$7$F$O0J2<$N$h$&$J$b$N$,$"$j$^$9!#\e(B
 @item @key{C-c C-m C-a}
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/alternative \e$B$H$7$F0O$_$^$9!#\e(B
 
 @item @key{C-c C-m C-a}
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/alternative \e$B$H$7$F0O$_$^$9!#\e(B
 

-@item @key{C-c C-x C-p}
+@item @key{C-c C-m C-p}

 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/parallel \e$B$H$7$F0O$_$^$9!#\e(B
 
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/parallel \e$B$H$7$F0O$_$^$9!#\e(B
 

-@item @key{C-c C-x C-m}
+@item @key{C-c C-m C-m}

 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/mixed \e$B$H$7$F0O$_$^$9!#\e(B
 
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/mixed \e$B$H$7$F0O$_$^$9!#\e(B
 

-@item @key{C-c C-x C-d}
+@item @key{C-c C-m C-d}

 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 
 \e$B;XDj$7$?\e(B region \e$B$r\e(B multipart/digest \e$B$H$7$F0O$_$^$9!#\e(B
 

-@item @key{C-c C-x C-s}
+@item @key{C-c C-m C-s}

 \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(cf. @ref{PGP})
 
 \e$B;XDj$7$?\e(B region \e$B$KEE;R=pL>$r9T$$$^$9!#\e(B(cf. @ref{PGP})
 

-@item @key{C-c C-x C-e}
+@item @key{C-c C-m C-e}

 \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(cf. @ref{PGP})
 
 \e$B;XDj$7$?\e(B region \e$B$r0E9f2=$7$^$9!#\e(B(cf. @ref{PGP})
 

-@item @key{C-c C-x C-q}
+@item @key{C-c C-m C-q}

 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
 \e$B$h$&$K$7$^$9!#!J8=:_$NHG$G$O$&$^$/F/$+$J$$$3$H$,$"$j$^$9!#$^$?!"EE;R=p\e(B
 \e$BL>$H$NJ;MQ$K4X$7$F$bIT40A4$G$9!K\e(B
 \e$B;XDj$7$?\e(B region \e$BFb$N\e(B tag \e$B$rL58z$K$7!"$=$N\e(B tag \e$B$rJ8;zNs$H$7$FMxMQ$G$-$k\e(B
 \e$B$h$&$K$7$^$9!#!J8=:_$NHG$G$O$&$^$/F/$+$J$$$3$H$,$"$j$^$9!#$^$?!"EE;R=p\e(B
 \e$BL>$H$NJ;MQ$K4X$7$F$bIT40A4$G$9!K\e(B