From 4ccf13e918f0fed3f38c2732d35021a8570c8550 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 16 Jul 2025 11:17:58 +0100 Subject: [PATCH] ; * lisp/vc/diff-mode.el (diff-mode): Scare-quote 'normal'. (cherry picked from commit 24db9b79623a04207aeff5071f1389ad38f66672) --- lisp/vc/diff-mode.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 1c3f7162abb..f868eaf7c1b 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1614,8 +1614,9 @@ else cover the whole buffer." ;;;###autoload (define-derived-mode diff-mode fundamental-mode "Diff" "Major mode for viewing/editing context diffs. -Supports unified and context diffs as well as (to a lesser extent) -normal 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, +most commonly encountered format.) 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 -- 2.39.5