[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4c467e4: * admin/gitmerge.el (gitmerge-mode-map): Convert to defv
From: |
Stefan Kangas |
Subject: |
master 4c467e4: * admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap. |
Date: |
Tue, 16 Nov 2021 22:26:05 -0500 (EST) |
branch: master
commit 4c467e4aff12e65fa4fa62d7f4bdcbf4a2bcd92c
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.
---
admin/gitmerge.el | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 67fca87..5aae6b4 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -96,16 +96,13 @@ 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)
- 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)
(defvar gitmerge-mode-font-lock-keywords
`((,gitmerge-log-regexp
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 4c467e4: * admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.,
Stefan Kangas <=