From 44faf546592a0c063d5044322f11bb0f006e613c Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 18 Nov 2021 12:11:35 +0100
Subject: [PATCH] Revert VC-related prefix user options to previous values

* lisp/vc/smerge-mode.el (smerge-command-prefix):
* lisp/vc/pcvs.el (cvs-minor-mode-prefix):
* lisp/vc/diff-mode.el (diff-minor-mode-prefix): Revert to
previous values, as external packages rely on those values.
---
 lisp/vc/diff-mode.el   | 7 +++----
 lisp/vc/pcvs.el        | 7 +++----
 lisp/vc/smerge-mode.el | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 87d30666da0..1cffd88a56f 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -264,15 +264,14 @@ and hunk-based syntax highlighting otherwise as a fallback."
      :help "Go to the next count'th file"]
     ))
 
-(defcustom diff-minor-mode-prefix "C-c ="
+(defcustom diff-minor-mode-prefix "\C-c =="
   "Prefix key for `diff-minor-mode' commands."
   :type '(choice (string "ESC")
-                 (string "C-c =") string)
-  :version "29.1")
+                 (string "\C-c=") string))
 
 (defvar-keymap diff-minor-mode-map
   :doc "Keymap for `diff-minor-mode'.  See also `diff-mode-shared-map'."
-  diff-minor-mode-prefix diff-mode-shared-map)
+  (key-description diff-minor-mode-prefix) diff-mode-shared-map)
 
 (define-minor-mode diff-auto-refine-mode
   "Toggle automatic diff hunk finer highlighting (Diff Auto Refine mode).
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index fa28d074a98..2d7b8cb2ef7 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -266,14 +266,13 @@
 ;;;; CVS-Minor mode
 ;;;;
 
-(defcustom cvs-minor-mode-prefix "C-x c"
+(defcustom cvs-minor-mode-prefix "\C-xc"
   "Prefix key for the `cvs-mode' bindings in `cvs-minor-mode'."
   :type 'string
-  :version "29.1"
-  :group 'pcl-cvs)
+   :group 'pcl-cvs)
 
 (defvar-keymap cvs-minor-mode-map
-  cvs-minor-mode-prefix 'cvs-mode-map
+  (key-description cvs-minor-mode-prefix) 'cvs-mode-map
   "e" '(menu-item nil cvs-mode-edit-log
 	          :filter (lambda (x)
                             (and (derived-mode-p 'log-view-mode) x))))
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index ee6ddf15881..6c1b8cc95b3 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -162,16 +162,15 @@ Used in `smerge-diff-base-upper' and related functions."
         ">" (cons "base-lower" #'smerge-diff-base-lower)
         "=" (cons "upper-lower" #'smerge-diff-upper-lower)))
 
-(defcustom smerge-command-prefix "C-c ^"
+(defcustom smerge-command-prefix "\C-c^"
   "Prefix for `smerge-mode' commands."
-  :version "29.1"
   :type '(choice (const :tag "ESC"   "\e")
-		 (const :tag "C-c ^" "C-c ^")
+		 (const :tag "C-c ^" "\C-c^")
 		 (const :tag "none"  "")
 		 string))
 
 (defvar-keymap smerge-mode-map
-  smerge-command-prefix smerge-basic-map)
+  (key-description smerge-command-prefix) smerge-basic-map)
 
 (defvar-local smerge-check-cache nil)
 (defun smerge-check (n)
-- 
2.39.2