Adjust `defvar-keymap' and `define-keymap' to the new syntax

* lisp/vc/smerge-mode.el (smerge-basic-map):
* lisp/vc/pcvs.el (cvs-mode-map):
(cvs-minor-mode-prefix):
* lisp/vc/log-view.el (log-view-mode-map):
* lisp/vc/log-edit.el (log-edit-mode-map):
* lisp/vc/diff-mode.el (diff-mode-shared-map):
(diff-minor-mode-prefix):
* lisp/vc/cvs-status.el (cvs-status-mode-map):
* lisp/simple.el (special-mode-map):
* lisp/outline.el (outline--insert-open-button):
(outline--insert-close-button):
* lisp/net/shr.el (shr-map):
* lisp/net/eww.el (eww-link-keymap):
(eww-mode-map):
(eww-submit-map):
(eww-bookmark-mode-map):
(eww-history-mode-map):
(eww-buffers-mode-map):
* lisp/mh-e/mh-speed.el (:keymap):
* lisp/mh-e/mh-show.el (:keymap):
* lisp/mh-e/mh-search.el (:keymap):
* lisp/mh-e/mh-letter.el (:keymap):
* lisp/mh-e/mh-folder.el (:keymap):
* lisp/international/emoji.el (emoji-list-mode-map):
* lisp/gnus/spam.el (:keymap):
* lisp/gnus/mml.el (mml-mode-map):
* lisp/gnus/message.el (message-mode-map):
* lisp/gnus/gnus-undo.el (gnus-undo-mode-map):
* lisp/gnus/gnus-topic.el (gnus-topic-mode-map):
* lisp/gnus/gnus-sum.el (:keymap):
* lisp/gnus/gnus-srvr.el (gnus-server-mode-map):
(gnus-browse-mode-map):
* lisp/gnus/gnus-salt.el (gnus-pick-mode-map):
(gnus-tree-mode-map):
* lisp/gnus/gnus-msg.el (:prefix):
* lisp/gnus/gnus-ml.el (gnus-mailing-list-mode-map):
* lisp/gnus/gnus-kill.el (gnus-kill-file-mode-map):
* lisp/gnus/gnus-html.el (gnus-html-displayed-image-map):
* lisp/gnus/gnus-group.el (:keymap):
* lisp/gnus/gnus-eform.el (gnus-edit-form-mode-map):
* lisp/gnus/gnus-draft.el (gnus-draft-mode-map):
* lisp/gnus/gnus-dired.el (gnus-dired-mode-map):
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-mode-map):
* lisp/gnus/gnus-art.el (:keymap):
(gnus-article-edit-mode-map):
* lisp/gnus/gnus-agent.el (gnus-agent-group-mode-map):
(gnus-agent-summary-mode-map):
(gnus-agent-server-mode-map):
(gnus-category-mode-map): Adjust `defvar-keymap' and
`define-keymap' to the new syntax.

5 files changed, 106 insertions, 106 deletions

diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index c700b3348df..ddf13d193ed 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -212,7 +212,7 @@ annotation.")
 
 ;; Save the "b" binding for a future `back'. Maybe?
 (define-keymap :keymap mh-folder-mode-map
-  " "           #'mh-page-msg
+  "SPC"         #'mh-page-msg
   "!"           #'mh-refile-or-write-again
   "'"           #'mh-toggle-tick
   ","           #'mh-header-display
@@ -223,15 +223,15 @@ annotation.")
   "?"           #'mh-help
   "E"           #'mh-extract-rejected-mail
   "M"           #'mh-modify
-  "\177"        #'mh-previous-page
-  "\C-d"        #'mh-delete-msg-no-motion
-  "\t"          #'mh-index-next-folder
-  [backtab]     #'mh-index-previous-folder
-  "\M-\t"       #'mh-index-previous-folder
-  "\e<"         #'mh-first-msg
-  "\e>"         #'mh-last-msg
-  "\ed"         #'mh-redistribute
-  "\r"          #'mh-show
+  "DEL"         #'mh-previous-page
+  "C-d"         #'mh-delete-msg-no-motion
+  "TAB"         #'mh-index-next-folder
+  "<backtab>"   #'mh-index-previous-folder
+  "C-M-i"       #'mh-index-previous-folder
+  "ESC <"       #'mh-first-msg
+  "ESC >"       #'mh-last-msg
+  "ESC d"       #'mh-redistribute
+  "RET"         #'mh-show
   "^"           #'mh-alt-refile-msg
   "c"           #'mh-copy-msg
   "d"           #'mh-delete-msg
@@ -242,10 +242,10 @@ annotation.")
   "k"           #'mh-delete-subject-or-thread
   "m"           #'mh-alt-send
   "n"           #'mh-next-undeleted-msg
-  "\M-n"        #'mh-next-unread-msg
+  "M-n"         #'mh-next-unread-msg
   "o"           #'mh-refile-msg
   "p"           #'mh-previous-undeleted-msg
-  "\M-p"        #'mh-previous-unread-msg
+  "M-p"         #'mh-previous-unread-msg
   "q"           #'mh-quit
   "r"           #'mh-reply
   "s"           #'mh-send
@@ -324,9 +324,9 @@ annotation.")
         "u"           #'mh-store-msg)   ;uuencode
 
   "D" (define-keymap :prefix 'mh-digest-map
-        " "           #'mh-page-digest
+        "SPC"         #'mh-page-digest
         "?"           #'mh-prefix-help
-        "\177"        #'mh-page-digest-backwards
+        "DEL"         #'mh-page-digest-backwards
         "b"           #'mh-burst-digest)
 
   "K" (define-keymap :prefix 'mh-mime-map
@@ -337,11 +337,11 @@ annotation.")
         "o"           #'mh-folder-save-mime-part
         "t"           #'mh-toggle-mime-buttons
         "v"           #'mh-folder-toggle-mime-part
-        "\t"          #'mh-next-button
-        [backtab]     #'mh-prev-button
-        "\M-\t"       #'mh-prev-button)
+        "TAB"         #'mh-next-button
+        "<backtab>"   #'mh-prev-button
+        "C-M-i"       #'mh-prev-button)
 
-  [mouse-2] #'mh-show-mouse)
+  "<mouse-2>" #'mh-show-mouse)
 
 ;; "C-c /" prefix is used in mh-folder-mode by pgp.el and mailcrypt
 
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 1f7902640a1..ebe94a7af83 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -115,67 +115,67 @@
 
 ;; If this changes, modify mh-letter-mode-help-messages accordingly, above.
 (define-keymap :keymap mh-letter-mode-map
-  " "                   #'mh-letter-complete-or-space
+  "SPC"                 #'mh-letter-complete-or-space
   ","                   #'mh-letter-confirm-address
-  "\C-c?"               #'mh-help
-  "\C-c\C-\\"           #'mh-fully-kill-draft ;if no C-q
-  "\C-c\C-^"            #'mh-insert-signature ;if no C-s
-  "\C-c\C-c"            #'mh-send-letter
-  "\C-c\C-d"            #'mh-insert-identity
-  "\C-c\C-e"            #'mh-mh-to-mime
-  "\C-c\C-f\C-a"        #'mh-to-field
-  "\C-c\C-f\C-b"        #'mh-to-field
-  "\C-c\C-f\C-c"        #'mh-to-field
-  "\C-c\C-f\C-d"        #'mh-to-field
-  "\C-c\C-f\C-f"        #'mh-to-fcc
-  "\C-c\C-f\C-l"        #'mh-to-field
-  "\C-c\C-f\C-m"        #'mh-to-field
-  "\C-c\C-f\C-r"        #'mh-to-field
-  "\C-c\C-f\C-s"        #'mh-to-field
-  "\C-c\C-f\C-t"        #'mh-to-field
-  "\C-c\C-fa"           #'mh-to-field
-  "\C-c\C-fb"           #'mh-to-field
-  "\C-c\C-fc"           #'mh-to-field
-  "\C-c\C-fd"           #'mh-to-field
-  "\C-c\C-ff"           #'mh-to-fcc
-  "\C-c\C-fl"           #'mh-to-field
-  "\C-c\C-fm"           #'mh-to-field
-  "\C-c\C-fr"           #'mh-to-field
-  "\C-c\C-fs"           #'mh-to-field
-  "\C-c\C-ft"           #'mh-to-field
-  "\C-c\C-i"            #'mh-insert-letter
-  "\C-c\C-m\C-e"        #'mh-mml-secure-message-encrypt
-  "\C-c\C-m\C-f"        #'mh-compose-forward
-  "\C-c\C-m\C-g"        #'mh-mh-compose-anon-ftp
-  "\C-c\C-m\C-i"        #'mh-compose-insertion
-  "\C-c\C-m\C-m"        #'mh-mml-to-mime
-  "\C-c\C-m\C-n"        #'mh-mml-unsecure-message
-  "\C-c\C-m\C-s"        #'mh-mml-secure-message-sign
-  "\C-c\C-m\C-t"        #'mh-mh-compose-external-compressed-tar
-  "\C-c\C-m\C-u"        #'mh-mh-to-mime-undo
-  "\C-c\C-m\C-x"        #'mh-mh-compose-external-type
-  "\C-c\C-mee"          #'mh-mml-secure-message-encrypt
-  "\C-c\C-mes"          #'mh-mml-secure-message-signencrypt
-  "\C-c\C-mf"           #'mh-compose-forward
-  "\C-c\C-mg"           #'mh-mh-compose-anon-ftp
-  "\C-c\C-mi"           #'mh-compose-insertion
-  "\C-c\C-mm"           #'mh-mml-to-mime
-  "\C-c\C-mn"           #'mh-mml-unsecure-message
-  "\C-c\C-mse"          #'mh-mml-secure-message-signencrypt
-  "\C-c\C-mss"          #'mh-mml-secure-message-sign
-  "\C-c\C-mt"           #'mh-mh-compose-external-compressed-tar
-  "\C-c\C-mu"           #'mh-mh-to-mime-undo
-  "\C-c\C-mx"           #'mh-mh-compose-external-type
-  "\C-c\C-o"            #'mh-open-line
-  "\C-c\C-q"            #'mh-fully-kill-draft
-  "\C-c\C-s"            #'mh-insert-signature
-  "\C-c\C-t"            #'mh-letter-toggle-header-field-display
-  "\C-c\C-w"            #'mh-check-whom
-  "\C-c\C-y"            #'mh-yank-cur-msg
-  "\C-c\M-d"            #'mh-insert-auto-fields
-  "\M-\t"               #'completion-at-point
-  "\t"                  #'mh-letter-next-header-field-or-indent
-  [backtab]             #'mh-letter-previous-header-field)
+  "C-c ?"               #'mh-help
+  "C-c C-\\"            #'mh-fully-kill-draft ;if no C-q
+  "C-c C-^"             #'mh-insert-signature ;if no C-s
+  "C-c C-c"             #'mh-send-letter
+  "C-c C-d"             #'mh-insert-identity
+  "C-c C-e"             #'mh-mh-to-mime
+  "C-c C-f C-a"         #'mh-to-field
+  "C-c C-f C-b"         #'mh-to-field
+  "C-c C-f C-c"         #'mh-to-field
+  "C-c C-f C-d"         #'mh-to-field
+  "C-c C-f C-f"         #'mh-to-fcc
+  "C-c C-f C-l"         #'mh-to-field
+  "C-c C-f C-m"         #'mh-to-field
+  "C-c C-f C-r"         #'mh-to-field
+  "C-c C-f C-s"         #'mh-to-field
+  "C-c C-f C-t"         #'mh-to-field
+  "C-c C-f a"           #'mh-to-field
+  "C-c C-f b"           #'mh-to-field
+  "C-c C-f c"           #'mh-to-field
+  "C-c C-f d"           #'mh-to-field
+  "C-c C-f f"           #'mh-to-fcc
+  "C-c C-f l"           #'mh-to-field
+  "C-c C-f m"           #'mh-to-field
+  "C-c C-f r"           #'mh-to-field
+  "C-c C-f s"           #'mh-to-field
+  "C-c C-f t"           #'mh-to-field
+  "C-c C-i"             #'mh-insert-letter
+  "C-c C-m C-e"         #'mh-mml-secure-message-encrypt
+  "C-c C-m C-f"         #'mh-compose-forward
+  "C-c C-m C-g"         #'mh-mh-compose-anon-ftp
+  "C-c C-m TAB"         #'mh-compose-insertion
+  "C-c C-m C-m"         #'mh-mml-to-mime
+  "C-c C-m C-n"         #'mh-mml-unsecure-message
+  "C-c C-m C-s"         #'mh-mml-secure-message-sign
+  "C-c C-m C-t"         #'mh-mh-compose-external-compressed-tar
+  "C-c C-m C-u"         #'mh-mh-to-mime-undo
+  "C-c C-m C-x"         #'mh-mh-compose-external-type
+  "C-c C-m e e"         #'mh-mml-secure-message-encrypt
+  "C-c C-m e s"         #'mh-mml-secure-message-signencrypt
+  "C-c C-m f"           #'mh-compose-forward
+  "C-c C-m g"           #'mh-mh-compose-anon-ftp
+  "C-c C-m i"           #'mh-compose-insertion
+  "C-c C-m m"           #'mh-mml-to-mime
+  "C-c C-m n"           #'mh-mml-unsecure-message
+  "C-c C-m s e"         #'mh-mml-secure-message-signencrypt
+  "C-c C-m s s"         #'mh-mml-secure-message-sign
+  "C-c C-m t"           #'mh-mh-compose-external-compressed-tar
+  "C-c C-m u"           #'mh-mh-to-mime-undo
+  "C-c C-m x"           #'mh-mh-compose-external-type
+  "C-c C-o"             #'mh-open-line
+  "C-c C-q"             #'mh-fully-kill-draft
+  "C-c C-s"             #'mh-insert-signature
+  "C-c C-t"             #'mh-letter-toggle-header-field-display
+  "C-c C-w"             #'mh-check-whom
+  "C-c C-y"             #'mh-yank-cur-msg
+  "C-c M-d"             #'mh-insert-auto-fields
+  "C-M-i"               #'completion-at-point
+  "TAB"                 #'mh-letter-next-header-field-or-indent
+  "<backtab>"           #'mh-letter-previous-header-field)
 
 ;; "C-c /" prefix is used in mh-letter-mode by pgp.el and mailcrypt.el.
 
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index ef84c5eb283..8012e624f16 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -550,19 +550,19 @@ group of results."
 
 ;; If this changes, modify mh-search-mode-help-messages accordingly, below.
 (define-keymap :keymap mh-search-mode-map
-  "\C-c?"               #'mh-help
-  "\C-c\C-c"            #'mh-index-do-search
-  "\C-c\C-p"            #'mh-pick-do-search
-  "\C-c\C-f\C-b"        #'mh-to-field
-  "\C-c\C-f\C-c"        #'mh-to-field
-  "\C-c\C-f\C-m"        #'mh-to-field
-  "\C-c\C-f\C-s"        #'mh-to-field
-  "\C-c\C-f\C-t"        #'mh-to-field
-  "\C-c\C-fb"           #'mh-to-field
-  "\C-c\C-fc"           #'mh-to-field
-  "\C-c\C-fm"           #'mh-to-field
-  "\C-c\C-fs"           #'mh-to-field
-  "\C-c\C-ft"           #'mh-to-field)
+  "C-c ?"              #'mh-help
+  "C-c C-c"            #'mh-index-do-search
+  "C-c C-p"            #'mh-pick-do-search
+  "C-c C-f C-b"        #'mh-to-field
+  "C-c C-f C-c"        #'mh-to-field
+  "C-c C-f C-m"        #'mh-to-field
+  "C-c C-f C-s"        #'mh-to-field
+  "C-c C-f C-t"        #'mh-to-field
+  "C-c C-f b"           #'mh-to-field
+  "C-c C-f c"           #'mh-to-field
+  "C-c C-f m"           #'mh-to-field
+  "C-c C-f s"           #'mh-to-field
+  "C-c C-f t"           #'mh-to-field)
 
 
 
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 524179648dc..0f85cd6f69a 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -560,7 +560,7 @@ still visible.\n")
 ;;; MH-Show Keys
 
 (define-keymap :keymap mh-show-mode-map
-  " "    #'mh-show-page-msg
+  "SPC"  #'mh-show-page-msg
   "!"    #'mh-show-refile-or-write-again
   "'"    #'mh-show-toggle-tick
   ","    #'mh-show-header-display
@@ -570,12 +570,12 @@ still visible.\n")
   "?"    #'mh-help
   "E"    #'mh-show-extract-rejected-mail
   "M"    #'mh-show-modify
-  "\177" #'mh-show-previous-page
-  "\C-d" #'mh-show-delete-msg-no-motion
-  "\t"   #'mh-show-next-button
-  [backtab] #'mh-show-prev-button
-  "\M-\t" #'mh-show-prev-button
-  "\ed"  #'mh-show-redistribute
+  "DEL"  #'mh-show-previous-page
+  "C-d"  #'mh-show-delete-msg-no-motion
+  "TAB"   #'mh-show-next-button
+  "<backtab>" #'mh-show-prev-button
+  "C-M-i" #'mh-show-prev-button
+  "ESC d" #'mh-show-redistribute
   "^"    #'mh-show-refile-msg
   "c"    #'mh-show-copy-msg
   "d"    #'mh-show-delete-msg
@@ -586,10 +586,10 @@ still visible.\n")
   "k"    #'mh-show-delete-subject-or-thread
   "m"    #'mh-show-send
   "n"    #'mh-show-next-undeleted-msg
-  "\M-n" #'mh-show-next-unread-msg
+  "M-n"  #'mh-show-next-unread-msg
   "o"    #'mh-show-refile-msg
   "p"    #'mh-show-previous-undeleted-msg
-  "\M-p" #'mh-show-previous-unread-msg
+  "M-p"  #'mh-show-previous-unread-msg
   "q"    #'mh-show-quit
   "r"    #'mh-show-reply
   "s"    #'mh-show-send
@@ -670,8 +670,8 @@ still visible.\n")
 
   "D" (define-keymap :prefix 'mh-show-digest-map
         "?"    #'mh-prefix-help
-        " "    #'mh-show-page-digest
-        "\177" #'mh-show-page-digest-backwards
+        "SPC"  #'mh-show-page-digest
+        "DEL"  #'mh-show-page-digest-backwards
         "b"    #'mh-show-burst-digest)
 
   "K" (define-keymap :prefix 'mh-show-mime-map
@@ -682,9 +682,9 @@ still visible.\n")
         "o"           #'mh-show-save-mime-part
         "i"           #'mh-show-inline-mime-part
         "t"           #'mh-show-toggle-mime-buttons
-        "\t"          #'mh-show-next-button
-        [backtab]     #'mh-show-prev-button
-        "\M-\t"       #'mh-show-prev-button))
+        "TAB"         #'mh-show-next-button
+        "<backtab>"   #'mh-show-prev-button
+        "C-M-i"       #'mh-show-prev-button))
 
 
 
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 82b108c8c8d..bf3a9e5774b 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -86,7 +86,7 @@
 (define-keymap :keymap mh-folder-speedbar-key-map
   "+"           #'mh-speed-expand-folder
   "-"           #'mh-speed-contract-folder
-  "\r"          #'mh-speed-view
+  "RET"         #'mh-speed-view
   "r"           #'mh-speed-refresh)
 
 (defvar mh-show-speedbar-key-map mh-folder-speedbar-key-map)