From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 5 Mar 2007 03:14:25 +0000 (+0000)
Subject: (diff-mode): Doc fix.
X-Git-Tag: emacs-pretest-22.0.96~260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b64d66b546219d0754ac637366504c09f4c0e67b;p=emacs.git

(diff-mode): Doc fix.
---

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index c4fac402dbf..ccd945db98e 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -985,7 +985,9 @@ See `after-change-functions' for the meaning of BEG, END and LEN."
 (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.
+normal diffs.  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.
@@ -993,7 +995,12 @@ headers for you on-the-fly.
 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
 a diff with \\[diff-reverse-direction].
-\\{diff-mode-map}"
+
+When the buffer is read-only, the Meta- modifier is not necessary
+to run the Diff mode commands:
+
+   \\{diff-mode-map}"
+
   (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
   (set (make-local-variable 'outline-regexp) diff-outline-regexp)
   (set (make-local-variable 'imenu-generic-expression)