From 8bb5c1bfec0929f2ba419e1c503f5acc01c336c2 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 1 Sep 2022 13:39:14 +0200 Subject: Make easy-mmode-defmap obsolete and adjust only caller * lisp/emacs-lisp/easy-mmode.el (easy-mmode-defmap): Make obsolete. * lisp/progmodes/gud.el (gud-menu-map): Use easy-menu-define. --- lisp/emacs-lisp/easy-mmode.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lisp/emacs-lisp/easy-mmode.el') diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index c3a4e9fc7ab..29ace89c3c7 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -719,9 +719,7 @@ The M, BS, and ARGS arguments are as per that function. DOC is 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)) + (declare (doc-string 3) (indent 1) (obsolete defvar-keymap "29.1")) `(defconst ,m (easy-mmode-define-keymap ,bs nil (if (boundp ',m) ,m) ,(cons 'list args)) ,doc)) -- cgit v1.2.3 From 119d59531e19893cdc7eda2abe7174261adcbcaa Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 1 Sep 2022 13:42:19 +0200 Subject: Make easy-mmode-define-keymap obsolete * lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-keymap): Make obsolete. (define-minor-mode): Add comment. --- lisp/emacs-lisp/easy-mmode.el | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lisp/emacs-lisp/easy-mmode.el') diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 29ace89c3c7..a1398bd12e7 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -417,6 +417,8 @@ 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) (easy-mmode-define-keymap m)) (t (error "Invalid keymap %S" m)))) ,(format "Keymap for `%s'." mode-name))) @@ -679,6 +681,7 @@ 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)) -- cgit v1.2.3 From 965ebf3484bf8ec39d0ee34f4040071fe3e5e04a Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 2 Sep 2022 14:58:30 +0200 Subject: Fix define-minor-mode :keymap obsoletion warning * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix some warning. --- lisp/emacs-lisp/easy-mmode.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/easy-mmode.el') diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index a1398bd12e7..7d54a84687b 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -419,7 +419,10 @@ No problems result if this variable is not bound. (cond ((keymapp m) m) ;; FIXME: `easy-mmode-define-keymap' is obsolete, ;; so this form should also be obsolete somehow. - ((listp m) (easy-mmode-define-keymap m)) + ((listp m) + (with-suppressed-warnings ((obsolete + easy-mmode-define-keymap)) + (easy-mmode-define-keymap m))) (t (error "Invalid keymap %S" m)))) ,(format "Keymap for `%s'." mode-name))) -- cgit v1.2.3