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

Include shorter bindings in diff-mode docstring

Browse source 
* lisp/vc/diff-mode.el (diff-read-only-map): New keymap,
factored out of code modifying minor-mode-map-alist.
(diff-mode): Include bindings from diff-read-only-map in
docstring (bug#34080).
This commit is contained in:
Sean Whitton 2025-07-19 11:17:25 +01:00
parent eb252e6454
commit c56c56b3c6
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -179,6 +179,14 @@ The default \"-b\" means to ignore whitespace-only changes,
;;;; keymap, menu, ... ;;;; keymap, menu, ...
;;;; ;;;;
;; The additional bindings in read-only `diff-mode' buffers are not
;; activated by turning on `diff-minor-mode' in those buffers. Instead,
;; a special entry in `minor-mode-map-alist' is used to achieve that.
;; I.e., `diff-mode-read-only' is a pseudo-minor mode for read-only
;; `diff-mode' buffers, while `diff-minor-mode' is a bona fide minor
;; mode for non-`diff-mode' buffers. (It's not clear there are
;; practical uses for `diff-minor-mode': bug#34080).
(defvar-keymap diff-mode-shared-map (defvar-keymap diff-mode-shared-map
:doc "Additional bindings for read-only `diff-mode' buffers. :doc "Additional bindings for read-only `diff-mode' buffers.
These bindings are also available with an ESC prefix These bindings are also available with an ESC prefix
@ -1598,12 +1606,14 @@ else cover the whole buffer."
(defvar-local diff-mode-read-only nil (defvar-local diff-mode-read-only nil
"Non-nil when read-only diff buffer uses short keys.") "Non-nil when read-only diff buffer uses short keys.")
(defvar-keymap diff-read-only-map
:doc "Additional bindings for read-only `diff-mode' buffers."
:keymap (make-composed-keymap diff-mode-shared-map special-mode-map))
;; It should be lower than `outline-minor-mode' and `view-mode'. ;; It should be lower than `outline-minor-mode' and `view-mode'.
(or (assq 'diff-mode-read-only minor-mode-map-alist) (or (assq 'diff-mode-read-only minor-mode-map-alist)
(nconc minor-mode-map-alist (nconc minor-mode-map-alist
(list (cons 'diff-mode-read-only (list (cons 'diff-mode-read-only diff-read-only-map))))
(make-composed-keymap diff-mode-shared-map
special-mode-map)))))
(defvar whitespace-style) (defvar whitespace-style)
(defvar whitespace-trailing-regexp) (defvar whitespace-trailing-regexp)
@ -1617,17 +1627,16 @@ else cover the whole buffer."
"Major mode for viewing/editing context diffs. "Major mode for viewing/editing context diffs.
Supports unified and context diffs as well as, to a lesser extent, diffs Supports unified and context diffs as well as, to a lesser extent, diffs
in the old \"normal\" format. (Unified diffs have become the standard, in the old \"normal\" format. (Unified diffs have become the standard,
most commonly encountered format.) most commonly encountered format.) If you edit the buffer manually,
`diff-mode' will try to update the hunk headers for you on-the-fly.
When the buffer is read-only, the ESC prefix is not necessary.
If you edit the buffer manually, `diff-mode' will try to update the hunk
headers for you on-the-fly.
You can also switch between context diff and unified diff with \\[diff-context->unified], You can also switch between context diff and unified diff with \\[diff-context->unified],
or vice versa with \\[diff-unified->context] and you can also reverse the direction of or vice versa with \\[diff-unified->context] and you can also reverse the direction of
a diff with \\[diff-reverse-direction]. a diff with \\[diff-reverse-direction].
\\{diff-mode-map}" \\{diff-mode-map}
In read-only buffers the following bindings are also available:
\\{diff-read-only-map}"
(setq-local font-lock-defaults diff-font-lock-defaults) (setq-local font-lock-defaults diff-font-lock-defaults)
(add-hook 'font-lock-mode-hook #'diff--font-lock-cleanup nil 'local) (add-hook 'font-lock-mode-hook #'diff--font-lock-cleanup nil 'local)