mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.

Browse source
This commit is contained in:
Stefan Kangas 2021-11-17 04:14:33 +01:00
parent 2a99138f17
commit 4c467e4aff
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
admin/gitmerge.el
View file

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