Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

diff-mode-shared-map: Don't inherit from special-mode-map

Browse source 
* lisp/vc/diff-mode.el (diff-mode-shared-map): No longer inherit
from special-mode-map.
(diff-mode-map): Tidy up list of unbindings now that we no
longer need to override any bindings from special-mode-map.
(minor-mode-map-alist): <diff-mode-read-only>: Ensure that the
minor mode keymap continues to inherit from special-mode-map by
calling make-composed-keymap here.

Co-authored-by: Stefan Monnier <monnier@iro.umontreal.ca>
This commit is contained in:
Sean Whitton 2025-05-12 10:11:18 +01:00
parent 882c849034
commit 4ddafede8d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,7 +180,6 @@ The default \"-b\" means to ignore whitespace-only changes,
;;;;
(defvar-keymap diff-mode-shared-map
:parent special-mode-map
"n" #'diff-hunk-next
"N" #'diff-file-next
"p" #'diff-hunk-prev
@ -207,8 +206,7 @@ The default \"-b\" means to ignore whitespace-only changes,
;; We want to inherit most bindings from
;; `diff-mode-shared-map', but not all since they may hide
;; useful `M-<foo>' global bindings when editing.
(dolist (key '("A" "r" "R" "g" "q" "W" "w" "z" "?"
"SPC" "S-SPC" "DEL"))
(dolist (key '("A" "r" "R" "W" "w"))
(keymap-set map key nil))
map)
;; From compilation-minor-mode.
@ -1599,7 +1597,9 @@ else cover the whole buffer."
;; It should be lower than `outline-minor-mode' and `view-mode'.
(or (assq 'diff-mode-read-only minor-mode-map-alist)
(nconc minor-mode-map-alist
(list (cons 'diff-mode-read-only diff-mode-shared-map))))
(list (cons 'diff-mode-read-only
(make-composed-keymap diff-mode-shared-map
special-mode-map)))))
(defvar whitespace-style)
(defvar whitespace-trailing-regexp)