From 1f08f2258beb16d20851f2d4cb85b94840b45ed4 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 21 Nov 2021 10:10:07 +0100
Subject: [PATCH] Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to
 defvar-keymap."

This reverts commit 4c467e4aff12e65fa4fa62d7f4bdcbf4a2bcd92c.
---
 admin/gitmerge.el | 17 ++++++++++-------
 1 file 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.")
 (defvar gitmerge-log-regexp
   "^\\([A-Z ]\\)\\s-*\\([0-9a-f]+\\) \\(.+?\\): \\(.*\\)$")
 
-(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)
+(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)
+    map)
+  "Keymap for gitmerge major mode.")
+
 
 (defvar gitmerge-mode-font-lock-keywords
   `((,gitmerge-log-regexp
-- 
2.39.2