From c1359abc96df3df245361645a3550e6c5ba46b6e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 20 Oct 2021 11:49:22 +0200 Subject: [PATCH] Fix typo in previous smerge-mode-map change * lisp/vc/smerge-mode.el (smerge-mode-map): Fix typo (bug#51303). --- lisp/vc/smerge-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.39.2