Merge from emacs--rel--22

[gnu-emacs] / lisp / gnus / gnus-art.el

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index f93a304be46a63caf34e8347c766c6d82eebeec4..a967c88a59fc6f84b44ad23d0002d1d9d82f3cbf 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6398,6 +6398,7 @@ KEY is a string or a vector."
 
 ;;`gnus-agent-mode' in gnus-agent.el will define it.
 (defvar gnus-agent-summary-mode)
+(defvar gnus-draft-mode)
 
 (defun gnus-article-describe-bindings (&optional prefix)
   "Show a list of all defined keys, and their definitions.
@@ -6408,7 +6409,7 @@ then we display only bindings that start with that prefix."
   (let ((keymap (copy-keymap gnus-article-mode-map))
        (map (copy-keymap gnus-article-send-map))
        (sumkeys (where-is-internal 'gnus-article-read-summary-keys))
-       agent)
+       agent draft)
     (define-key keymap "S" map)
     (define-key map [t] nil)
     (with-current-buffer gnus-article-current-summary
@@ -6418,10 +6419,13 @@ then we display only bindings that start with that prefix."
          (when (setq def (key-binding key))
            (define-key keymap key def))))
       (when (boundp 'gnus-agent-summary-mode)
-       (setq agent gnus-agent-summary-mode)))
+       (setq agent gnus-agent-summary-mode))
+      (when (boundp 'gnus-draft-mode)
+       (setq draft gnus-draft-mode)))
     (with-temp-buffer
       (use-local-map keymap)
       (set (make-local-variable 'gnus-agent-summary-mode) agent)
+      (set (make-local-variable 'gnus-draft-mode) draft)
       (describe-bindings prefix))
     (let ((item `((lambda (prefix)
                    (save-excursion
@@ -7891,6 +7895,9 @@ url is put as the `gnus-button-url' overlay property on the button."
   (Info-directory)
   (Info-menu url))
 
+;; Called after pgg-snarf-keys-region, which autoloads pgg.el.
+(declare-function pgg-display-output-buffer "pgg" (start end status))
+
 (defun gnus-button-openpgp (url)
   "Retrieve and add an OpenPGP key given URL from an OpenPGP header."
   (with-temp-buffer