master 281f34f: Convert two `easy-mmode-defmap' usages to `defvar-keymap'

[Lars Ingebrigtsen]

branch: master
commit 281f34f9de6f3cf7d731630df9d48d384c3d989d
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Convert two `easy-mmode-defmap' usages to `defvar-keymap'
    
    * lisp/vc/log-edit.el (log-edit-mode-map):
    * lisp/vc/cvs-status.el (cvs-status-mode-map): Convert
    `easy-mmode-defmap' to `defvar-keymap'.
---
 lisp/vc/cvs-status.el | 27 +++++++++++++--------------
 lisp/vc/log-edit.el   | 28 +++++++++++++---------------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index 63b8863..6b49690 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -29,23 +29,22 @@
 ;;; Code:
 
 (require 'cl-lib)
-(require 'pcvs-util)
+(require 'pcvs)
+(require 'easy-mmode)
 
 ;;;
 
-(easy-mmode-defmap cvs-status-mode-map
-  '(("n"       . next-line)
-    ("p"       . previous-line)
-    ("N"       . cvs-status-next)
-    ("P"       . cvs-status-prev)
-    ("\M-n"    . cvs-status-next)
-    ("\M-p"    . cvs-status-prev)
-    ("t"       . cvs-status-cvstrees)
-    ("T"       . cvs-status-trees)
-    (">"        . cvs-mode-checkout))
-  "CVS-Status' keymap."
-  :group 'cvs-status
-  :inherit 'cvs-mode-map)
+(defvar-keymap cvs-status-mode-map
+  :inherit 'cvs-mode-map
+  "n"         #'next-line
+  "p"         #'previous-line
+  "N"         #'cvs-status-next
+  "P"         #'cvs-status-prev
+  (kbd "M-n") #'cvs-status-next
+  (kbd "M-p") #'cvs-status-prev
+  "t"         #'cvs-status-cvstrees
+  "T"         #'cvs-status-trees
+  ">"         #'cvs-mode-checkout)
 
 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
 ;;  "Menu for `cvs-status-mode'."
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 4d151d5..c8d089e 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -54,21 +54,19 @@
 (define-obsolete-variable-alias 'vc-log-mode-map 'log-edit-mode-map "28.1")
 (define-obsolete-variable-alias 'vc-log-entry-mode 'log-edit-mode-map "28.1")
 
-(easy-mmode-defmap log-edit-mode-map
-  '(("\C-c\C-c" . log-edit-done)
-    ("\C-c\C-a" . log-edit-insert-changelog)
-    ("\C-c\C-w" . log-edit-generate-changelog-from-diff)
-    ("\C-c\C-d" . log-edit-show-diff)
-    ("\C-c\C-f" . log-edit-show-files)
-    ("\C-c\C-k" . log-edit-kill-buffer)
-    ("\C-a"     . log-edit-beginning-of-line)
-    ("\M-n"    . log-edit-next-comment)
-    ("\M-p"    . log-edit-previous-comment)
-    ("\M-r"    . log-edit-comment-search-backward)
-    ("\M-s"    . log-edit-comment-search-forward)
-    ("\C-c?"   . log-edit-mode-help))
-  "Keymap for the `log-edit-mode' (to edit version control log messages)."
-  :group 'log-edit)
+(defvar-keymap log-edit-mode-map
+  (kbd "C-c C-c") #'log-edit-done
+  (kbd "C-c C-a") #'log-edit-insert-changelog
+  (kbd "C-c C-w") #'log-edit-generate-changelog-from-diff
+  (kbd "C-c C-d") #'log-edit-show-diff
+  (kbd "C-c C-f") #'log-edit-show-files
+  (kbd "C-c C-k") #'log-edit-kill-buffer
+  (kbd "C-a")     #'log-edit-beginning-of-line
+  (kbd "M-n")     #'log-edit-next-comment
+  (kbd "M-p")     #'log-edit-previous-comment
+  (kbd "M-r")     #'log-edit-comment-search-backward
+  (kbd "M-s")     #'log-edit-comment-search-forward
+  (kbd "C-c ?")   #'log-edit-mode-help)
 
 (easy-menu-define log-edit-menu log-edit-mode-map
   "Menu used for `log-edit-mode'."