summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-09-21 10:10:22 +0200
committerStefan Kangas <stefankangas@gmail.com>2022-09-21 10:15:45 +0200
commit00f6bb1286c6f52bd2f70650e720c88ec090dae9 (patch)
treedbcbfc621dd6dcdeca90e3ff81ba36ddf439e0a9 /admin
parentcee9a2cbe0cd2cb1af602077727c03f2ae62fa90 (diff)
downloademacs-00f6bb1286c6f52bd2f70650e720c88ec090dae9.tar.gz
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')
-rw-r--r--admin/gitmerge.el13
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.")
(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)
+ (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)
+ ;; For convenience:
+ (define-key map [(n)] #'next-line)
+ (define-key map [(p)] #'previous-line)
map)
"Keymap for gitmerge major mode.")