Synch to No Gnus 200411142346.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6f46c0..82050d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-15  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-art.el (gnus-header-button-alist): Handle URLs in OpenPGP:
+       headers separately.
+       (gnus-button-openpgp): New function, inspired by Jochen K\e,A|\e(Bpper
+       <jochen-+It19tn3Rl9sbm7dSapR3bNAH6kLmebB@public.gmane.org>.
+
 2004-11-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-start.el (gnus-convert-old-newsrc): Assign

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0d063c3..bd613d1 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6794,6 +6794,8 @@ variable it the real callback function."
      0 (>= gnus-button-browse-level 0) browse-url 0)
     ("^[^:]+:" gnus-button-url-regexp
      0 (>= gnus-button-browse-level 0) browse-url 0)
+    ("^OpenPGP:.*url=" gnus-button-url-regexp
+     0 (>= gnus-button-browse-level 0) gnus-button-openpgp 0)
     ("^[^:]+:" "\\bmailto:\\([-a-z.@_+0-9%=?&/]+\\)"
      0 (>= gnus-button-message-level 0) gnus-url-mailto 1)
     ("^[^:]+:" "\\(<\\(url: \\)?\\(nntp\\|news\\):\\([^>\n ]*\\)>\\)"
@@ -7199,6 +7201,13 @@ specified by `gnus-button-alist'."
   (Info-directory)
   (Info-menu url))
 
+(defun gnus-button-openpgp (url)
+  "Retrieve and add an OpenPGP key given URL from an OpenPGP header."
+  (with-temp-buffer
+    (mm-url-insert-file-contents-external url)
+    (pgg-snarf-keys-region (point-min) (point-max))
+    (pgg-display-output-buffer nil nil nil)))
+
 (defun gnus-button-message-id (message-id)
   "Fetch MESSAGE-ID."
   (with-current-buffer gnus-summary-buffer