From: yoichi <yoichi>
Date: Tue, 9 Mar 2004 03:51:23 +0000 (+0000)
Subject: merge from semi-1_14 branch
X-Git-Tag: emiko-1_14-epg-branchpoint~28
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930b8862d45c81981f94debdd9edcafccc17d93e;p=elisp%2Fsemi.git

merge from semi-1_14 branch
---

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index ba407c4..5868fd0 100644
--- 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 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-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
@@ -397,27 +397,27 @@ Operations to make enclosure are following:
 <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>
-<kt>C-c C-x C-m
+<kt>C-c C-m C-m
 <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>
-<kt>C-c C-x C-s
+<kt>C-c C-m C-s
 <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>
-<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
diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index e8e4fd0..7271050 100644
--- 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 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-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
@@ -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-x C-p}
+@item @key{C-c C-m C-p}
 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.
 
-@item @key{C-c C-x C-d}
+@item @key{C-c C-m C-d}
 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})
 
-@item @key{C-c C-x C-e}
+@item @key{C-c C-m C-e}
 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.)
diff --git a/mime-ui-ja.sgml b/mime-ui-ja.sgml
index 8e0db7d..e1656a0 100644
--- 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 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-p	preview editing MIME message.
+C-c C-x p	preview editing MIME message.
 ...
 
 って訳で、C-c C-x C-i を押して、挿入したい binary file を指定します。
@@ -401,26 +401,26 @@ enclosure を作るための操作としては以下のようなものがあります。
 <kd>
 指定した region を multipart/alternative として囲みます。
 </kd>
-<kt>C-c C-x C-p
+<kt>C-c C-m C-p
 <kd>
 指定した region を multipart/parallel として囲みます。
 </kd>
-<kt>C-c C-x C-m
+<kt>C-c C-m C-m
 <kd>
 指定した region を multipart/mixed として囲みます。
 </kd>
-<kt>C-c C-x C-d
+<kt>C-c C-m C-d
 <kd>
 指定した region を multipart/digest として囲みます。
 </kd>
-<kt>C-c C-x C-s
+<kt>C-c C-m C-s
 <kd>
 指定した region に電子署名を行います。<cf node="PGP">
 </kd>
-<kt>C-c C-x C-e
+<kt>C-c C-m C-e
 <kd>
 指定した region を暗号化します。<cf node="PGP">
-<kt>C-c C-x C-q
+<kt>C-c C-m C-q
 <kd>
 指定した region 内の tag を無効にし、その tag を文字列として利用できる
 ようにします。（現在の版ではうまく働かないことがあります。また、電子署
diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 79523f0..8fe71de 100644
--- 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 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-p	preview editing MIME message.
+C-c C-x p	preview editing MIME message.
 ...
 
 って訳で、C-c C-x C-i を押して、挿入したい binary file を指定します。
@@ -455,22 +455,22 @@ enclosure を作るための操作としては以下のようなものがあります。
 @item @key{C-c C-m C-a}
 指定した region を multipart/alternative として囲みます。
 
-@item @key{C-c C-x C-p}
+@item @key{C-c C-m C-p}
 指定した region を multipart/parallel として囲みます。
 
-@item @key{C-c C-x C-m}
+@item @key{C-c C-m C-m}
 指定した region を multipart/mixed として囲みます。
 
-@item @key{C-c C-x C-d}
+@item @key{C-c C-m C-d}
 指定した region を multipart/digest として囲みます。
 
-@item @key{C-c C-x C-s}
+@item @key{C-c C-m C-s}
 指定した region に電子署名を行います。(cf. @ref{PGP})
 
-@item @key{C-c C-x C-e}
+@item @key{C-c C-m C-e}
 指定した region を暗号化します。(cf. @ref{PGP})
 
-@item @key{C-c C-x C-q}
+@item @key{C-c C-m C-q}
 指定した region 内の tag を無効にし、その tag を文字列として利用できる
 ようにします。（現在の版ではうまく働かないことがあります。また、電子署
 名との併用に関しても不完全です）