summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2021-10-20 11:49:22 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2021-10-20 11:49:22 +0200
commitc1359abc96df3df245361645a3550e6c5ba46b6e (patch)
treeada9bb5bf272aebf5f151fd1c6609d814b6ac3a5
parent7a6cc97f3c2fe8c01ac71e39514a73c0674b9061 (diff)
downloademacs-c1359abc96df3df245361645a3550e6c5ba46b6e.tar.gz
Fix typo in previous smerge-mode-map change
* lisp/vc/smerge-mode.el (smerge-mode-map): Fix typo (bug#51303).
-rw-r--r--lisp/vc/smerge-mode.el2
1 files changed, 1 insertions, 1 deletions
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)