diff options
| author | Chong Yidong | 2007-04-06 18:45:34 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-04-06 18:45:34 +0000 |
| commit | 6035b97e5c285a9e86e4f7bc99c60a5cf4c89b4e (patch) | |
| tree | e16dd0cd6a9621dff430e6a2f3c3e733afb26bd2 /lisp/diff-mode.el | |
| parent | a8cf60899a2cab7b06566f22416d04d7c49f1ee0 (diff) | |
| download | emacs-6035b97e5c285a9e86e4f7bc99c60a5cf4c89b4e.tar.gz emacs-6035b97e5c285a9e86e4f7bc99c60a5cf4c89b4e.zip | |
(diff-mode): Revert 2007-03-04 change.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 543e1bd6a39..3cd2fb37dbb 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -985,8 +985,7 @@ See `after-change-functions' for the meaning of BEG, END and LEN." | |||
| 985 | (define-derived-mode diff-mode fundamental-mode "Diff" | 985 | (define-derived-mode diff-mode fundamental-mode "Diff" |
| 986 | "Major mode for viewing/editing context diffs. | 986 | "Major mode for viewing/editing context diffs. |
| 987 | Supports unified and context diffs as well as (to a lesser extent) | 987 | Supports unified and context diffs as well as (to a lesser extent) |
| 988 | normal diffs. If you edit the buffer manually, diff-mode will try | 988 | normal diffs. |
| 989 | to update the hunk headers for you on-the-fly. | ||
| 990 | 989 | ||
| 991 | When the buffer is read-only, the ESC prefix is not necessary. | 990 | When the buffer is read-only, the ESC prefix is not necessary. |
| 992 | If you edit the buffer manually, diff-mode will try to update the hunk | 991 | If you edit the buffer manually, diff-mode will try to update the hunk |
| @@ -996,9 +995,6 @@ You can also switch between context diff and unified diff with \\[diff-context-> | |||
| 996 | or vice versa with \\[diff-unified->context] and you can also reverse the direction of | 995 | or vice versa with \\[diff-unified->context] and you can also reverse the direction of |
| 997 | a diff with \\[diff-reverse-direction]. | 996 | a diff with \\[diff-reverse-direction]. |
| 998 | 997 | ||
| 999 | When the buffer is read-only, the Meta- modifier is not necessary | ||
| 1000 | to run the Diff mode commands: | ||
| 1001 | |||
| 1002 | \\{diff-mode-map}" | 998 | \\{diff-mode-map}" |
| 1003 | 999 | ||
| 1004 | (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults) | 1000 | (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults) |