From a09940e9f4df4e83b7074e48accdf08423b4296a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 20 Jan 2025 18:32:33 +0100 Subject: [PATCH] Prefer defvar-keymap in bat-mode.el * lisp/progmodes/bat-mode.el (bat-mode-map): Prefer defvar-keymap. (bat-menu): Move to top level. (cherry picked from commit 275df7420cfb6a514171cb69a03235ee09aebebf) --- lisp/progmodes/bat-mode.el | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el index 226614928f1..30a63071007 100644 --- a/lisp/progmodes/bat-mode.el +++ b/lisp/progmodes/bat-mode.el @@ -101,7 +101,15 @@ (,(concat "\\_<" (regexp-opt UNIX) "\\_>") . font-lock-warning-face))))) -(defvar bat-menu +(defvar-keymap bat-mode-map + "C-c C-/" #'bat-cmd-help ;FIXME: Why not C-c C-? ? + "C-c C-a" #'bat-run-args + "C-c C-c" #'bat-run + "C-c C-t" #'bat-template + "C-c C-v" #'bat-run) + +(easy-menu-define bat-menu bat-mode-map + "Menu used for `bat-mode'." '("Bat" ["Run" bat-run :help "Run script"] ["Run with Args" bat-run-args :help "Run script with args"] @@ -112,16 +120,6 @@ "--" ["Help (Command)" bat-cmd-help :help "Show help page for DOS command"])) -(defvar bat-mode-map - (let ((map (make-sparse-keymap))) - (easy-menu-define nil map nil bat-menu) - (define-key map [?\C-c ?\C-/] 'bat-cmd-help) ;FIXME: Why not C-c C-? ? - (define-key map [?\C-c ?\C-a] 'bat-run-args) - (define-key map [?\C-c ?\C-c] 'bat-run) - (define-key map [?\C-c ?\C-t] 'bat-template) - (define-key map [?\C-c ?\C-v] 'bat-run) - map)) - (defvar bat-mode-syntax-table (let ((table (make-syntax-table))) (modify-syntax-entry ?\n ">" table) -- 2.39.5