Synch with the semi-1_14 branch.

diff --git a/mime-edit.el b/mime-edit.el
index febccc2..80718f9 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -805,9 +805,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)
     )

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index 14d28ef..ba407c4 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/mime-ui-ja.sgml
+++ b/mime-ui-ja.sgml
@@ -639,6 +639,16 @@ mime-edit \e$B$G$O\e(B <concept>PGP/MIME</concept> (RFC 2015) \e$B$*$h$S\e(B
 <code>pgp</code> \e$B$b$7$/$O\e(B <code>pgp5</code> \e$B$G$9!#\e(B
 </defvar>
 
+<defvar name="pgg-insert-url-function">
+<p>
+\e$B80%5!<%P$+$i8x3+80$r<h$j4s$;$k:]$K;H$&4X?t$G$9!#%G%U%)%k%H$G$O\e(B
+Emacs/W3 \e$B$r;H$&@_Dj$K$J$C$F$$$^$9!#\e(Bemacs-w3m \e$B$r;H$&>l9g$K$O\e(B
+\e$B<!$N$h$&$K@_Dj$7$^$9!#\e(B
+<lisp>
+(setq pgg-insert-url-function #'w3m-retrieve)
+</lisp>
+</defvar>
+
 
 <h2> \e$B2!KU\e(B
 <node> Buttons

diff --git a/mime-ui-ja.texi b/mime-ui-ja.texi
index 8f2d791..79523f0 100644 (file)
--- a/mime-ui-ja.texi
+++ b/mime-ui-ja.texi
@@ -716,6 +716,17 @@ mime-edit \e$B$G$O\e(B @strong{PGP/MIME} (RFC 2015) \e$B$*$h$S\e(B@strong{PGP-kazu}
 @end defvar
 
 
+@defvar pgg-insert-url-function
+
+\e$B80%5!<%P$+$i8x3+80$r<h$j4s$;$k:]$K;H$&4X?t$G$9!#%G%U%)%k%H$G$O\e(B
+Emacs/W3 \e$B$r;H$&@_Dj$K$J$C$F$$$^$9!#\e(Bemacs-w3m \e$B$r;H$&>l9g$K$O\e(B
+\e$B<!$N$h$&$K@_Dj$7$^$9!#\e(B
+@lisp
+(setq pgg-insert-url-function #'w3m-retrieve)
+@end lisp
+@end defvar
+
+
 
 @node Buttons, Acting-condition configuration, PGP, Various
 @section \e$B2!KU\e(B