diff options
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index c4fac402dbf..543e1bd6a39 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) @@ -1368,7 +1375,8 @@ With a prefix argument, REVERSE the hunk." (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 |