From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 20 Oct 2021 09:49:22 +0000 (+0200)
Subject: Fix typo in previous smerge-mode-map change
X-Git-Tag: emacs-29.0.90~3671^2~482
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1359abc96df3df245361645a3550e6c5ba46b6e;p=emacs.git

Fix typo in previous smerge-mode-map change

* lisp/vc/smerge-mode.el (smerge-mode-map): Fix typo (bug#51303).
---

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 0be1a03c650..2cc5ee739fd 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -170,7 +170,7 @@ Used in `smerge-diff-base-upper' and related functions."
 		 string))
 
 (defvar-keymap smerge-mode-map
-  smerge-command-prefix 'smerge-basic-map)
+  smerge-command-prefix smerge-basic-map)
 
 (defvar-local smerge-check-cache nil)
 (defun smerge-check (n)