Fix gud-minor-mode-menu

* lisp/emacs-lisp/easy-mmode.el (define-minor-mode)
(easy-mmode-define-keymap): Don't declare obsolete, since we are
still using it in gud.el.  (Bug#59769)  (Bug#59605)
Do not merge to master.

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 8de4d8a9c2d026c141b7f8aff0bc643f479417b6..2df390ecbeba3d470756995e075d74e38a56afad 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -417,8 +417,6 @@ No problems result if this variable is not bound.
          `(defvar ,keymap-sym
             (let ((m ,keymap))
               (cond ((keymapp m) m)
-                     ;; FIXME: `easy-mmode-define-keymap' is obsolete,
-                     ;; so this form should also be obsolete somehow.
                     ((listp m)
                       (with-suppressed-warnings ((obsolete
                                                   easy-mmode-define-keymap))
@@ -684,7 +682,6 @@ Valid keywords and arguments are:
   :group     Ignored.
   :suppress  Non-nil to call `suppress-keymap' on keymap,
              `nodigits' to suppress digits as prefix arguments."
-  (declare (obsolete define-keymap "29.1"))
   (let (inherit dense suppress)
     (while args
       (let ((key (pop args))