diff options
| author | Stefan Kangas | 2022-09-21 10:10:22 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-09-21 10:15:45 +0200 |
| commit | 00f6bb1286c6f52bd2f70650e720c88ec090dae9 (patch) | |
| tree | dbcbfc621dd6dcdeca90e3ff81ba36ddf439e0a9 /admin/gitmerge.el | |
| parent | cee9a2cbe0cd2cb1af602077727c03f2ae62fa90 (diff) | |
| download | emacs-00f6bb1286c6f52bd2f70650e720c88ec090dae9.tar.gz emacs-00f6bb1286c6f52bd2f70650e720c88ec090dae9.zip | |
Bind 'n'/'p' in gitmerge-mode to line scroll
* admin/gitmerge.el (gitmerge-mode-map): Bind 'n' and 'p' to
'next-line' and 'previous-line'.
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 25bed949ad9..4f7c66cc5c2 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -97,11 +97,14 @@ If nil, the function `gitmerge-default-branch' guesses.") | |||
| 97 | 97 | ||
| 98 | (defvar gitmerge-mode-map | 98 | (defvar gitmerge-mode-map |
| 99 | (let ((map (make-keymap))) | 99 | (let ((map (make-keymap))) |
| 100 | (define-key map [(l)] 'gitmerge-show-log) | 100 | (define-key map [(l)] #'gitmerge-show-log) |
| 101 | (define-key map [(d)] 'gitmerge-show-diff) | 101 | (define-key map [(d)] #'gitmerge-show-diff) |
| 102 | (define-key map [(f)] 'gitmerge-show-files) | 102 | (define-key map [(f)] #'gitmerge-show-files) |
| 103 | (define-key map [(s)] 'gitmerge-toggle-skip) | 103 | (define-key map [(s)] #'gitmerge-toggle-skip) |
| 104 | (define-key map [(m)] 'gitmerge-start-merge) | 104 | (define-key map [(m)] #'gitmerge-start-merge) |
| 105 | ;; For convenience: | ||
| 106 | (define-key map [(n)] #'next-line) | ||
| 107 | (define-key map [(p)] #'previous-line) | ||
| 105 | map) | 108 | map) |
| 106 | "Keymap for gitmerge major mode.") | 109 | "Keymap for gitmerge major mode.") |
| 107 | 110 | ||