mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-20 15:10:37 -08:00
Code Issues Projects Releases Wiki Activity

Bind "s" in diff-mode-read-only-map, not diff-mode-shared-map

Browse source 
* lisp/vc/diff-mode.el (diff-mode-shared-map): Move binding for
"s" from here ...
(diff-mode-read-only-map): ... to here (bug#80330).
This commit is contained in:
Sean Whitton 2026-02-05 11:31:05 +00:00
parent 8beb69b77c
commit 0dfaa75612
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,8 +201,9 @@ The default \"-b\" means to ignore whitespace-only changes,
(defvar-keymap diff-mode-shared-map
:doc "Bindings for read-only `diff-mode' buffers.
These bindings are also available with an ESC prefix
(i.e. a \\=`M-' prefix) in read-write `diff-mode' buffers,
and with a `diff-minor-mode-prefix' prefix in `diff-minor-mode'.
(i.e. a \\=`M-' prefix) in all `diff-mode' buffers, including in
particular read-write `diff-mode' buffers, and with a
`diff-minor-mode-prefix' prefix in `diff-minor-mode'.
See also `diff-mode-read-only-map'."
"n" #'diff-hunk-next
"N" #'diff-file-next
@ -218,7 +219,6 @@ See also `diff-mode-read-only-map'."
"<mouse-2>" #'diff-goto-source
"o" #'diff-goto-source ; other-window
"<remap> <undo>" #'undo-ignore-read-only
"s" #'diff-split-hunk
;; The foregoing commands don't affect buffers beyond this one.
;; The following command is the only one that has a single-character
@ -235,15 +235,17 @@ See also `diff-mode-read-only-map'."
:doc "Additional bindings for read-only `diff-mode' buffers.
Most of the bindings for read-only `diff-mode' buffers are in
`diff-mode-shared-map'. This map contains additional bindings for
read-only `diff-mode' buffers that are *not* available with an ESC
prefix (i.e. a \\=`M-' prefix) in read-write `diff-mode' buffers."
read-only `diff-mode' buffers that are *not* also available with an ESC
prefix (i.e. a \\=`M-' prefix) in read-write (nor read-only) `diff-mode'
buffers."
;; We don't want the following in read-write `diff-mode' buffers
;; because they hide useful `M-<foo>' global bindings when editing.
"W" #'widen
"w" #'diff-kill-ring-save
"A" #'diff-ediff-patch
"r" #'diff-restrict-view
"R" #'diff-reverse-direction)
"R" #'diff-reverse-direction
"s" #'diff-split-hunk)
(defvar-keymap diff-mode-map
:doc "Keymap for `diff-mode'. See also `diff-mode-shared-map'."