procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert VC-related prefix user options to previous values

Browse source 
* 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.
This commit is contained in:
Lars Ingebrigtsen 2021-11-18 12:11:35 +01:00
parent 6cad3dc75e
commit 44faf54659
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/vc/diff-mode.el
View file

@ -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).

7
lisp/vc/pcvs.el
View file

@ -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))))

7
lisp/vc/smerge-mode.el
View file

@ -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)