From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 3 Dec 2022 09:32:00 +0000 (+0200)
Subject: Fix gud-minor-mode-menu
X-Git-Tag: emacs-29.0.90~1367
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=641ef36403b2d485bb4f500a7a6de33b6da7642c;p=emacs.git

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 8de4d8a9c2d..2df390ecbeb 100644
--- 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))