diff options
| author | Stefan Kangas | 2021-11-21 10:10:07 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-11-21 10:10:46 +0100 |
| commit | 1f08f2258beb16d20851f2d4cb85b94840b45ed4 (patch) | |
| tree | 5c13bf0c860b240a39c6fce0f4d840bb751187d6 | |
| parent | 867c57029c4d71b9378d34dfbdd975dca8a104f4 (diff) | |
| download | emacs-1f08f2258beb16d20851f2d4cb85b94840b45ed4.tar.gz emacs-1f08f2258beb16d20851f2d4cb85b94840b45ed4.zip | |
Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."
This reverts commit 4c467e4aff12e65fa4fa62d7f4bdcbf4a2bcd92c.
| -rw-r--r-- | admin/gitmerge.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 5aae6b40a0c..67fca87c119 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -96,13 +96,16 @@ 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-keymap gitmerge-mode-map | 99 | (defvar gitmerge-mode-map |
| 100 | :doc "Keymap for gitmerge major mode." | 100 | (let ((map (make-keymap))) |
| 101 | "l" #'gitmerge-show-log | 101 | (define-key map [(l)] 'gitmerge-show-log) |
| 102 | "d" #'gitmerge-show-diff | 102 | (define-key map [(d)] 'gitmerge-show-diff) |
| 103 | "f" #'gitmerge-show-files | 103 | (define-key map [(f)] 'gitmerge-show-files) |
| 104 | "s" #'gitmerge-toggle-skip | 104 | (define-key map [(s)] 'gitmerge-toggle-skip) |
| 105 | "m" #'gitmerge-start-merge) | 105 | (define-key map [(m)] 'gitmerge-start-merge) |
| 106 | map) | ||
| 107 | "Keymap for gitmerge major mode.") | ||
| 108 | |||
| 106 | 109 | ||
| 107 | (defvar gitmerge-mode-font-lock-keywords | 110 | (defvar gitmerge-mode-font-lock-keywords |
| 108 | `((,gitmerge-log-regexp | 111 | `((,gitmerge-log-regexp |