diff lisp/diff-mode.el @ 90785:8c2ef9d5d4a8

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 662-669) - Update from CVS - Fix read-only prompt problem in isearch - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 207-208) - Merge from emacs--devo--0 - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-184

--- a/lisp/diff-mode.el	Fri Mar 09 03:30:57 2007 +0000
+++ b/lisp/diff-mode.el	Mon Mar 12 00:42:43 2007 +0000
@@ -985,7 +985,9 @@
 (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 @@
 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)
@@ -1368,7 +1375,8 @@
                        (yes-or-no-p (format "Really apply this hunk to %s? "
                                             (file-name-nondirectory
                                              buffer-file-name)))))))
-      (error (substitute-command-keys
+      (error "%s"
+	     (substitute-command-keys
               (format "Use %s\\[diff-apply-hunk] to apply it to the other file"
                       (if (not reverse) "\\[universal-argument] ")))))
      ((and switched