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, 42 insertions, 42 deletions

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70ebc1d2ec6..031a73143e4 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -314,11 +314,11 @@ parameter, and should return the (possibly) transformed URL."
 
 (defvar-keymap eww-link-keymap
   :parent shr-map
-  "\r" #'eww-follow-link)
+  "RET" #'eww-follow-link)
 
 (defvar-keymap eww-image-link-keymap
   :parent shr-map
-  "\r" #'eww-follow-link)
+  "RET" #'eww-follow-link)
 
 (defun eww-suggested-uris nil
   "Return the list of URIs to suggest at the `eww' prompt.
@@ -1045,11 +1045,11 @@ the like."
 (defvar-keymap eww-mode-map
   "g" #'eww-reload             ;FIXME: revert-buffer-function instead!
   "G" #'eww
-  [?\M-\r] #'eww-open-in-new-buffer
-  [?\t] #'shr-next-link
-  [?\M-\t] #'shr-previous-link
-  [backtab] #'shr-previous-link
-  [delete] #'scroll-down-command
+  "M-RET" #'eww-open-in-new-buffer
+  "TAB" #'shr-next-link
+  "C-M-i" #'shr-previous-link
+  "<backtab>" #'shr-previous-link
+  "<delete>" #'scroll-down-command
   "l" #'eww-back-url
   "r" #'eww-forward-url
   "n" #'eww-next-url
@@ -1068,16 +1068,16 @@ the like."
   "S" #'eww-list-buffers
   "F" #'eww-toggle-fonts
   "D" #'eww-toggle-paragraph-direction
-  [(meta C)] #'eww-toggle-colors
-  [(meta I)] #'eww-toggle-images
+  "M-C" #'eww-toggle-colors
+  "M-I" #'eww-toggle-images
 
   "b" #'eww-add-bookmark
   "B" #'eww-list-bookmarks
-  [(meta n)] #'eww-next-bookmark
-  [(meta p)] #'eww-previous-bookmark
+  "M-n" #'eww-next-bookmark
+  "M-p" #'eww-previous-bookmark
 
-  [(mouse-8)] #'eww-back-url
-  [(mouse-9)] #'eww-forward-url
+  "<mouse-8>" #'eww-back-url
+  "<mouse-9>" #'eww-forward-url
 
   :menu '("Eww"
           ["Exit" quit-window t]
@@ -1300,42 +1300,42 @@ just re-display the HTML already fetched."
 (defvar eww-form nil)
 
 (defvar-keymap eww-submit-map
-  "\r" #'eww-submit
-  [(control c) (control c)] #'eww-submit)
+  "RET" #'eww-submit
+  "C-c C-c" #'eww-submit)
 
 (defvar-keymap eww-submit-file
-  "\r" #'eww-select-file
-  [(control c) (control c)] #'eww-submit)
+  "RET" #'eww-select-file
+  "C-c C-c" #'eww-submit)
 
 (defvar-keymap eww-checkbox-map
-  " " #'eww-toggle-checkbox
-  "\r" #'eww-toggle-checkbox
-  [(control c) (control c)] #'eww-submit)
+  "SPC" #'eww-toggle-checkbox
+  "RET" #'eww-toggle-checkbox
+  "C-c C-c" #'eww-submit)
 
 (defvar-keymap eww-text-map
   :full t :parent text-mode-map
-  "\r" #'eww-submit
-  [(control a)] #'eww-beginning-of-text
-  [(control c) (control c)] #'eww-submit
-  [(control e)] #'eww-end-of-text
-  [?\t] #'shr-next-link
-  [?\M-\t] #'shr-previous-link
-  [backtab] #'shr-previous-link)
+  "RET" #'eww-submit
+  "C-a" #'eww-beginning-of-text
+  "C-c C-c" #'eww-submit
+  "C-e" #'eww-end-of-text
+  "TAB" #'shr-next-link
+  "M-TAB" #'shr-previous-link
+  "<backtab>" #'shr-previous-link)
 
 (defvar-keymap eww-textarea-map
   :full t :parent text-mode-map
-  "\r" #'forward-line
-  [(control c) (control c)] #'eww-submit
-  [?\t] #'shr-next-link
-  [?\M-\t] #'shr-previous-link
-  [backtab] #'shr-previous-link)
+  "RET" #'forward-line
+  "C-c C-c" #'eww-submit
+  "TAB" #'shr-next-link
+  "M-TAB" #'shr-previous-link
+  "<backtab>" #'shr-previous-link)
 
 (defvar-keymap eww-select-map
   :doc "Map for select buttons"
-  "\r" #'eww-change-select
-  [follow-link] 'mouse-face
-  [mouse-2] #'eww-change-select
-  [(control c) (control c)] #'eww-submit)
+  "RET" #'eww-change-select
+  "<follow-link>" 'mouse-face
+  "<mouse-2>" #'eww-change-select
+  "C-c C-c" #'eww-submit)
 
 (defun eww-beginning-of-text ()
   "Move to the start of the input field."
@@ -2171,9 +2171,9 @@ If ERROR-OUT, signal user-error if there are no bookmarks."
     (eww-browse-url (plist-get bookmark :url))))
 
 (defvar-keymap eww-bookmark-mode-map
-  [(control k)] #'eww-bookmark-kill
-  [(control y)] #'eww-bookmark-yank
-  "\r" #'eww-bookmark-browse
+  "C-k" #'eww-bookmark-kill
+  "C-y" #'eww-bookmark-yank
+  "RET" #'eww-bookmark-browse
   :menu '("Eww Bookmark"
           ["Exit" quit-window t]
           ["Browse" eww-bookmark-browse
@@ -2247,7 +2247,7 @@ If ERROR-OUT, signal user-error if there are no bookmarks."
     (eww-restore-history history)))
 
 (defvar-keymap eww-history-mode-map
-  "\r" #'eww-history-browse
+  "RET" #'eww-history-browse
   "n" #'next-line
   "p" #'previous-line
   :menu '("Eww History"
@@ -2366,8 +2366,8 @@ If ERROR-OUT, signal user-error if there are no bookmarks."
   (eww-buffer-show))
 
 (defvar-keymap eww-buffers-mode-map
-  [(control k)] #'eww-buffer-kill
-  "\r" #'eww-buffer-select
+  "C-k" #'eww-buffer-kill
+  "RET" #'eww-buffer-select
   "n" #'eww-buffer-show-next
   "p" #'eww-buffer-show-previous
   :menu '("Eww Buffers"