* lisp/vc/diff-mode.el (diff-mode): Disable view-mode keybindings.

Put the property 'mode-class' with the value 'special' on the symbol
'diff-mode'.  This fixes the case when 'view-read-only' is non-nil
by disabling activation of 'view-mode' that overrides single keys
from 'diff-mode-shared-map' (bug#75993).

(cherry picked from commit 35fa7126903a0ac6a28901d194f0753acf60928d)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 7d92676d7992508e280427a5152f362782aa9d6f..bb1f8068d489a512db95e3410c6620512c5eb458 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1549,6 +1549,7 @@ else cover the whole buffer."
 (defvar whitespace-style)
 (defvar whitespace-trailing-regexp)
 
+(put 'diff-mode 'mode-class 'special)
 ;;;###autoload
 (define-derived-mode diff-mode fundamental-mode "Diff"
   "Major mode for viewing/editing context diffs.