[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 669b911 3/5: ; Fix previous easy-menu-define conversion
From: |
Stefan Kangas |
Subject: |
master 669b911 3/5: ; Fix previous easy-menu-define conversion |
Date: |
Sun, 21 Feb 2021 05:11:50 -0500 (EST) |
branch: master
commit 669b911c6660120c73b7760063d490872240a727
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
; Fix previous easy-menu-define conversion
* lisp/emacs-lisp/re-builder.el (reb-mode-menu):
* lisp/progmodes/make-mode.el (makefile-mode-menu): Replace :button
attribute with :style and :selected.
---
lisp/emacs-lisp/re-builder.el | 6 +++---
lisp/progmodes/make-mode.el | 18 ++++++++++++------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 7f404c8..455fcac 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -250,9 +250,9 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
["Change target buffer..." reb-change-target-buffer
:help "Change the target buffer and display it in the target window"]
["Case sensitive" reb-toggle-case
- :button (:toggle . (with-current-buffer
- reb-target-buffer
- (null case-fold-search)))
+ :style toggle
+ :selected (with-current-buffer reb-target-buffer
+ (null case-fold-search))
:help "Toggle case sensitivity of searches for RE Builder target buffer"]
"---"
["Quit" reb-quit
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index d444ce2..3f466e1 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -631,22 +631,28 @@ The function must satisfy this calling convention:
("Switch Makefile Type"
["GNU make" makefile-gmake-mode
:help "An adapted `makefile-mode' that knows about GNU make"
- :button (:radio . (eq major-mode 'makefile-gmake-mode))]
+ :style radio
+ :selected (eq major-mode 'makefile-gmake-mode)]
["Automake" makefile-automake-mode
:help "An adapted `makefile-mode' that knows about automake"
- :button (:radio . (eq major-mode 'makefile-automake-mode))]
+ :style radio
+ :selected (eq major-mode 'makefile-automake-mode)]
["BSD" makefile-bsdmake-mode
:help "An adapted `makefile-mode' that knows about BSD make"
- :button (:radio . (eq major-mode 'makefile-bsdmake-mode))]
+ :style radio
+ :selected (eq major-mode 'makefile-bsdmake-mode)]
["Classic" makefile-mode
:help "`makefile-mode' with no special functionality"
- :button (:radio . (eq major-mode 'makefile-mode))]
+ :style radio
+ :selected (eq major-mode 'makefile-mode)]
["Imake" makefile-imake-mode
:help "An adapted `makefile-mode' that knows about imake"
- :button (:radio . (eq major-mode 'makefile-imake-mode))]
+ :style radio
+ :selected (eq major-mode 'makefile-imake-mode)]
["Makepp" makefile-makepp-mode
:help "An adapted `makefile-mode' that knows about makepp"
- :button (:radio . (eq major-mode 'makefile-makepp-mode))])))
+ :style radio
+ :selected (eq major-mode 'makefile-makepp-mode)])))
(defvar makefile-browser-map