diff options
| author | Stefan Monnier | 2024-10-22 10:19:09 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2024-10-22 10:19:09 -0400 |
| commit | a9cf51d5f01cb7067c547af2905ab391979b18f4 (patch) | |
| tree | ab47457a2ac20224220528352ce155732e4cbbdd | |
| parent | 9fdc03e8f9868bb9253a0df9bf0c1b718e8576a8 (diff) | |
| download | emacs-a9cf51d5f01cb7067c547af2905ab391979b18f4.tar.gz emacs-a9cf51d5f01cb7067c547af2905ab391979b18f4.zip | |
* lisp/vc/smerge-mode.el (global-map): Mitigate bug#73544
| -rw-r--r-- | lisp/vc/smerge-mode.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index aad3e302826..13258b15845 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -168,6 +168,10 @@ Used in `smerge-diff-base-upper' and related functions." | |||
| 168 | (const :tag "none" "") | 168 | (const :tag "none" "") |
| 169 | string)) | 169 | string)) |
| 170 | 170 | ||
| 171 | ;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error | ||
| 172 | ;; when SMerge mode is not enabled (bug#73544). | ||
| 173 | ;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap)) | ||
| 174 | |||
| 171 | (defvar-keymap smerge-mode-map | 175 | (defvar-keymap smerge-mode-map |
| 172 | (key-description smerge-command-prefix) smerge-basic-map) | 176 | (key-description smerge-command-prefix) smerge-basic-map) |
| 173 | 177 | ||