]> git.eshelyaron.com Git - emacs.git/commitdiff
Bind 'n'/'p' in gitmerge-mode to line scroll
authorStefan Kangas <stefankangas@gmail.com>
Wed, 21 Sep 2022 08:10:22 +0000 (10:10 +0200)
committerStefan Kangas <stefankangas@gmail.com>
Wed, 21 Sep 2022 08:15:45 +0000 (10:15 +0200)
* admin/gitmerge.el (gitmerge-mode-map): Bind 'n' and 'p' to
'next-line' and 'previous-line'.

admin/gitmerge.el

index 25bed949ad91cbf6ff05691c66f6898ca230f342..4f7c66cc5c2c0137a8442905d8048a471cd95041 100644 (file)
@@ -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.")