mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/smerge-mode.el (global-map): Mitigate bug#73544

Browse source
This commit is contained in:
Stefan Monnier 2024-10-22 10:19:09 -04:00
parent 9fdc03e8f9
commit a9cf51d5f0
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,6 +168,10 @@ Used in `smerge-diff-base-upper' and related functions."
(const :tag "none" "")
string))
;; Make it so `C-x ^ n' doesn't insert `n' but just signals an error
;; when SMerge mode is not enabled (bug#73544).
;;;###autoload (global-set-key "\C-c^" (make-sparse-keymap))
(defvar-keymap smerge-mode-map
(key-description smerge-command-prefix) smerge-basic-map)