diff options
Diffstat (limited to 'admin')
| -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.") | |||
| 96 | (defvar gitmerge-log-regexp | 96 | (defvar gitmerge-log-regexp |
| 97 | "^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$") | 97 | "^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$") |
| 98 | 98 | ||
| 99 | (defvar gitmerge-mode-map | 99 | (defvar-keymap gitmerge-mode-map |
| 100 | (let ((map (make-keymap))) | 100 | :doc "Keymap for gitmerge major mode." |
| 101 | (define-key map [(l)] 'gitmerge-show-log) | 101 | "l" #'gitmerge-show-log |
| 102 | (define-key map [(d)] 'gitmerge-show-diff) | 102 | "d" #'gitmerge-show-diff |
| 103 | (define-key map [(f)] 'gitmerge-show-files) | 103 | "f" #'gitmerge-show-files |
| 104 | (define-key map [(s)] 'gitmerge-toggle-skip) | 104 | "s" #'gitmerge-toggle-skip |
| 105 | (define-key map [(m)] 'gitmerge-start-merge) | 105 | "m" #'gitmerge-start-merge) |
| 106 | map) | ||
| 107 | "Keymap for gitmerge major mode.") | ||
| 108 | |||
| 109 | 106 | ||
| 110 | (defvar gitmerge-mode-font-lock-keywords | 107 | (defvar gitmerge-mode-font-lock-keywords |
| 111 | `((,gitmerge-log-regexp | 108 | `((,gitmerge-log-regexp |