From: yamaoka <yamaoka>
Date: Tue, 15 Oct 2002 10:17:53 +0000 (+0000)
Subject: Synch with the semi-1_14 branch.
X-Git-Tag: emiko-1_14-epg-branchpoint~48
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7024c6f61cc273cb3042e332e95631e5c895a98d;p=elisp%2Fsemi.git

Synch with the semi-1_14 branch.
---

diff --git a/mime-edit.el b/mime-edit.el
index ba071ed..13b59d6 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -760,9 +760,9 @@ Tspecials means any character that matches with it in header must be quoted.")
     (encrypted	"Enclose as encrypted"	mime-edit-enclose-pgp-encrypted-region)
     (quote	"Verbatim region"	mime-edit-enclose-quote-region)
     (key	"Insert Public Key"	mime-edit-insert-key)
-    (split	"About split"           mime-edit-set-split)
-    (sign	"About sign"		mime-edit-set-sign)
-    (encrypt	"About encryption"	mime-edit-set-encrypt)
+    (split	"Set splitting"		mime-edit-set-split)
+    (sign	"PGP sign"		mime-edit-set-sign)
+    (encrypt	"PGP encrypt"		mime-edit-set-encrypt)
     (preview	"Preview Message"	mime-edit-preview-message)
     (level	"Toggle transfer-level"	mime-edit-toggle-transfer-level))
   "MIME-edit menubar entry.")
diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index 14d28ef..ba407c4 100644
--- a/mime-ui-en.sgml
+++ b/mime-ui-en.sgml
@@ -634,6 +634,16 @@ The value should be a symbol.  Allowed versions are <code>gpg</code>,
 <code>pgp</code> or <code>pgp5</code>.
 </defvar>
 
+<defvar name="pgg-insert-url-function">
+<p>
+The function to fetch public key from the keyserver.
+Use Emacs/W3 by the default setting. To use emacs-w3m
+instead, set as follows:
+<lisp>
+(setq pgg-insert-url-function #'w3m-retrieve)
+</lisp>
+</defvar>
+
 
 <h2> Mouse button
 <node> Buttons
diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index d3f4638..e8e4fd0 100644
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -711,6 +711,17 @@ The value should be a symbol.  Allowed versions are @code{gpg},
 @end defvar
 
 
+@defvar pgg-insert-url-function
+
+The function to fetch public key from the keyserver.
+Use Emacs/W3 by the default setting. To use emacs-w3m
+instead, set as follows:
+@lisp
+(setq pgg-insert-url-function #'w3m-retrieve)
+@end lisp
+@end defvar
+
+
 
 @node Buttons, Acting-condition configuration, PGP, Various
 @section Mouse button
diff --git a/mime-ui-ja.sgml b/mime-ui-ja.sgml
index c86d791..8e0db7d 100644
--- a/mime-ui-ja.sgml
+++ b/mime-ui-ja.sgml
@@ -639,6 +639,16 @@ mime-edit では <concept>PGP/MIME</concept> (RFC 2015) および
 <code>pgp</code> もしくは <code>pgp5</code> です。
 </defvar>
 
+<defvar name="pgg-insert-url-function">
+<p>
+鍵サーバから公開鍵を取り寄せる際に使う関数です。デフォルトでは
+Emacs/W3 を使う設定になっています。emacs-w3m を使う場合には
+次のように設定します。
+<lisp>
+(setq pgg-insert-url-function #'w3m-retrieve)
+</lisp>
+</defvar>
+
 
 <h2> 押釦
 <node> Buttons
diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 8f2d791..79523f0 100644
--- a/mime-ui-ja.texi
+++ b/mime-ui-ja.texi
@@ -716,6 +716,17 @@ mime-edit では @strong{PGP/MIME} (RFC 2015) および@strong{PGP-kazu}
 @end defvar
 
 
+@defvar pgg-insert-url-function
+
+鍵サーバから公開鍵を取り寄せる際に使う関数です。デフォルトでは
+Emacs/W3 を使う設定になっています。emacs-w3m を使う場合には
+次のように設定します。
+@lisp
+(setq pgg-insert-url-function #'w3m-retrieve)
+@end lisp
+@end defvar
+
+
 
 @node Buttons, Acting-condition configuration, PGP, Various
 @section 押釦