diff options
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 67fca87c119..5aae6b40a0c 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 |