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.

1 files changed, 18 insertions, 18 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