diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /lisp/vc/diff-mode.el | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 357ce001b3c..b80337eb742 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -272,8 +272,7 @@ and hunk-based syntax highlighting otherwise as a fallback." (defcustom diff-minor-mode-prefix "\C-c=" "Prefix key for `diff-minor-mode' commands." - :type '(choice (string "ESC") - (string "\C-c=") string)) + :type '(choice (string "\e") (string "\C-c=") string)) (defvar-keymap diff-minor-mode-map :doc "Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'." |