3 files changed, 32 insertions, 28 deletions

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index d484d16ba95..fa909cc93f4 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7323,15 +7323,17 @@ The state which existed when entering the ephemeral is reset."
 
 ;;; Dead summaries.
 
-(defvar gnus-dead-summary-mode-map
-  (let ((map (make-keymap)))
-    (suppress-keymap map)
-    (substitute-key-definition 'undefined 'gnus-summary-wake-up-the-dead map)
-    (dolist (key '("\C-d" "\r" "\177" [delete]))
-      (define-key map key 'gnus-summary-wake-up-the-dead))
-    (dolist (key '("q" "Q"))
-      (define-key map key 'bury-buffer))
-    map))
+(defvar-keymap gnus-dead-summary-mode-map
+  :full t :suppress t
+  "C-d"      #'gnus-summary-wake-up-the-dead
+  "RET"      #'gnus-summary-wake-up-the-dead
+  "DEL"      #'gnus-summary-wake-up-the-dead
+  "<delete>" #'gnus-summary-wake-up-the-dead
+  "q"        #'bury-buffer
+  "Q"        #'bury-buffer)
+
+(keymap-substitute gnus-dead-summary-mode-map
+                   'undefined 'gnus-summary-wake-up-the-dead)
 
 (define-minor-mode gnus-dead-summary-mode
   "Minor mode for Gnus summary buffers."
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 6fad088a6c9..53b7c332ded 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2803,23 +2803,27 @@ See Info node `(gnus)Formatting Variables'."
 ;;;
 
 (defun gnus-suppress-keymap (keymap)
+  (declare (obsolete nil "31.1"))
   (suppress-keymap keymap)
   (let ((keys '([delete] "\177" "\M-u"))) ;[mouse-2]
     (while keys
       (define-key keymap (pop keys) 'undefined))))
 
-(defvar gnus-article-mode-map
-  (let ((keymap (make-sparse-keymap)))
-    (gnus-suppress-keymap keymap)
-    keymap))
-(defvar gnus-summary-mode-map
-  (let ((keymap (make-keymap)))
-    (gnus-suppress-keymap keymap)
-    keymap))
-(defvar gnus-group-mode-map
-  (let ((keymap (make-keymap)))
-    (gnus-suppress-keymap keymap)
-    keymap))
+(defvar-keymap gnus-article-mode-map
+  :suppress t
+  "<delete>" #'undefined
+  "DEL"      #'undefined
+  "M-u"      #'undefined)
+(defvar-keymap gnus-summary-mode-map
+  :full t :suppress t
+  "<delete>" #'undefined
+  "DEL"      #'undefined
+  "M-u"      #'undefined)
+(defvar-keymap gnus-group-mode-map
+  :full t :suppress t
+  "<delete>" #'undefined
+  "DEL"      #'undefined
+  "M-u"      #'undefined)
 
 
 
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 8273c48ff97..87acd4dd515 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -536,13 +536,11 @@ result of the verification."
                  (item :tag "ask" nil))
   :group 'mime-security)
 
-(defvar mm-viewer-completion-map
-  (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
-    (set-keymap-parent map minibuffer-local-completion-map)
-    ;; Should we bind other key to minibuffer-complete-word?
-    (define-key map " " 'self-insert-command)
-    map)
-  "Keymap for input viewer with completion.")
+(defvar-keymap mm-viewer-completion-map
+  :doc "Keymap for input viewer with completion."
+  :parent minibuffer-local-completion-map
+  ;; Should we bind other key to minibuffer-complete-word?
+  "SPC" #'self-insert-command)
 
 ;;; The functions.