Mercurial > emacs
diff lisp/diff-mode.el @ 90786:ca12f314faac
Changes from arch/CVS synchronization
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 18 Mar 2007 14:00:43 +0000 |
parents | 8c2ef9d5d4a8 |
children | 91bf6e05918b |
line wrap: on
line diff
--- a/lisp/diff-mode.el Mon Mar 12 00:42:43 2007 +0000 +++ b/lisp/diff-mode.el Sun Mar 18 14:00:43 2007 +0000 @@ -985,9 +985,7 @@ (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. If you edit the buffer manually, diff-mode will try -to update the hunk headers for you on-the-fly. - +normal diffs. 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. @@ -995,12 +993,7 @@ 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]. - -When the buffer is read-only, the Meta- modifier is not necessary -to run the Diff mode commands: - - \\{diff-mode-map}" - +\\{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) @@ -1375,8 +1368,7 @@ (yes-or-no-p (format "Really apply this hunk to %s? " (file-name-nondirectory buffer-file-name))))))) - (error "%s" - (substitute-command-keys + (error (substitute-command-keys (format "Use %s\\[diff-apply-hunk] to apply it to the other file" (if (not reverse) "\\[universal-argument] "))))) ((and switched