Synch to Oort Gnus 200304141340.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32b7fd9..1f0d5cd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-14  Simon Josefsson  <jas@extundo.com>
+
+       * mailcap.el (mailcap-mime-data): Add application/pgp-keys.
+
 2003-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mm-util.el (mm-sort-coding-systems-predicate): Convert elements

diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 62baf32..61b0c8c 100644 (file)
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -172,7 +172,11 @@
      ("sieve"
       (viewer . sieve-mode)
       (test   . (fboundp 'sieve-mode))
-      (type   . "application/sieve")))
+      (type   . "application/sieve"))
+     ("pgp-keys"
+      (viewer . "gpg --import --interactive --verbose")
+      (type   . "application/pgp-keys")
+      ("needsterminal")))
     ("audio"
      ("x-mpeg"
       (viewer . "maplay %s")

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index bbff24a..80dc6ed 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -9976,6 +9976,9 @@ Privacy Guard when you click on the MIME button (@pxref{Using MIME}).
 @example
 application/pgp-keys; gpg --import --interactive --verbose; needsterminal
 @end example
+
+This happens to also be the default action defined in
+@var{mailcap-mime-data}.
 @end ignore
 
 @node Mailing List

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 13ad2c7..a707b55 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -10511,6 +10511,9 @@ Privacy Guard when you click on the MIME button (@pxref{Using MIME}).
 application/pgp-keys; gpg --import --interactive --verbose; needsterminal
 @end example
 
+This happens to also be the default action defined in
+@var{mailcap-mime-data}.
+
 @node Mailing List
 @section Mailing List