From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 20 Feb 2025 03:11:23 +0000 (+0100)
Subject: Prefer defvar-keymap in admin/gitmerge.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f1ac7908462db1f3215fd5b3ad3cb420e5fb395;p=emacs.git

Prefer defvar-keymap in admin/gitmerge.el

* admin/gitmerge.el (gitmerge-mode-map): Prefer defvar-keymap.

(cherry picked from commit 3c93085650762c04ae3988dedc6b872b7f217143)
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a4f1efcff50..5bfb23dc3a2 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -95,18 +95,16 @@ If nil, the function `gitmerge-default-branch' guesses.")
 (defvar gitmerge-log-regexp
   "^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$")
 
-(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)
-    ;; For convenience:
-    (define-key map [(n)] #'next-line)
-    (define-key map [(p)] #'previous-line)
-    map)
-  "Keymap for gitmerge major mode.")
+(defvar-keymap gitmerge-mode-map
+  :doc "Keymap for gitmerge major mode."
+  "l" #'gitmerge-show-log
+  "d" #'gitmerge-show-diff
+  "f" #'gitmerge-show-files
+  "s" #'gitmerge-toggle-skip
+  "m" #'gitmerge-start-merge
+  ;; For convenience:
+  "n" #'next-line
+  "p" #'previous-line)
 
 
 (defvar gitmerge-mode-font-lock-keywords