procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer defvar-keymap in admin/gitmerge.el

Browse source 
* admin/gitmerge.el (gitmerge-mode-map): Prefer defvar-keymap.
This commit is contained in:
Stefan Kangas 2025-02-20 04:11:23 +01:00
parent c24a142657
commit 3c93085650
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
admin/gitmerge.el
View file

@ -95,18 +95,16 @@ If nil, the function `gitmerge-default-branch' guesses.")
(defvar gitmerge-log-regexp
"^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$")
(defvar gitmerge-mode-map
(let ((map (make-keymap)))
(define-key map [(l)] #'gitmerge-show-log)
(define-key map [(d)] #'gitmerge-show-diff)
(define-key map [(f)] #'gitmerge-show-files)
(define-key map [(s)] #'gitmerge-toggle-skip)
(define-key map [(m)] #'gitmerge-start-merge)
;; For convenience:
(define-key map [(n)] #'next-line)
(define-key map [(p)] #'previous-line)
map)
"Keymap for gitmerge major mode.")
(defvar-keymap gitmerge-mode-map
:doc "Keymap for gitmerge major mode."
"l" #'gitmerge-show-log
"d" #'gitmerge-show-diff
"f" #'gitmerge-show-files
"s" #'gitmerge-toggle-skip
"m" #'gitmerge-start-merge
;; For convenience:
"n" #'next-line
"p" #'previous-line)
(defvar gitmerge-mode-font-lock-keywords