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

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

Browse source 
This reverts commit 4c467e4aff.
This commit is contained in:
Stefan Kangas 2021-11-21 10:10:07 +01:00
parent 867c57029c
commit 1f08f2258b
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
admin/gitmerge.el
View file

@ -96,13 +96,16 @@ If nil, the function `gitmerge-default-branch' guesses.")
(defvar gitmerge-log-regexp
"^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$")
(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)
(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)
map)
"Keymap for gitmerge major mode.")
(defvar gitmerge-mode-font-lock-keywords
`((,gitmerge-log-regexp