Prefer defvar-keymap to easy-mmode-defmap

* lisp/progmodes/gud.el (gud-minibuffer-local-map):
* lisp/vc/pcvs-info.el (cvs-status-map): Use defvar-keymap.

* lisp/emacs-lisp/easy-mmode.el (easy-mmode-defmap): Document as
deprecated.

lisp/emacs-lisp/easy-mmode.el

@@ -696,7 +696,11 @@ Valid keywords and arguments are:
 (defmacro easy-mmode-defmap (m bs doc &rest args)
   "Define a constant M whose value is the result of `easy-mmode-define-keymap'.
 The M, BS, and ARGS arguments are as per that function.  DOC is
-the constant's documentation."
+the constant's documentation.
+
+This macro is deprecated; use `defvar-keymap' instead."
+  ;; FIXME: Declare obsolete in favor of `defvar-keymap'.  It is still
+  ;; used for `gud-menu-map' and `gud-minor-mode-map', so fix that first.
   (declare (doc-string 3) (indent 1))
   `(defconst ,m
      (easy-mmode-define-keymap ,bs nil (if (boundp ',m) ,m) ,(cons 'list args))

lisp/progmodes/gud.el

@@ -744,10 +744,10 @@ The option \"--fullname\" must be included in this value."
 
     output))
 
-(easy-mmode-defmap gud-minibuffer-local-map
+(defvar-keymap gud-minibuffer-local-map
-  '(("\C-i" . comint-dynamic-complete-filename))
+  :doc "Keymap for minibuffer prompting of gud startup command."
-  "Keymap for minibuffer prompting of gud startup command."
+  :parent minibuffer-local-map
-  :inherit minibuffer-local-map)
+  "C-i" #'comint-dynamic-complete-filename)
 
 (defun gud-query-cmdline (minor-mode &optional init)
   (let* ((hist-sym (gud-symbol 'history nil minor-mode))

lisp/vc/pcvs-info.el

@@ -130,9 +130,9 @@ to confuse some users sometimes."
 (defvar cvs-bakprefix ".#"
   "The prefix that CVS prepends to files when rcsmerge'ing.")
 
-(easy-mmode-defmap cvs-status-map
+(defvar-keymap cvs-status-map
-  '(([(mouse-2)] . cvs-mode-toggle-mark))
+  :doc "Local keymap for text properties of status."
-  "Local keymap for text properties of status.")
+  "<mouse-2>" #'cvs-mode-toggle-mark)
 
 ;; Constructor: