Mercurial > emacs
comparison lisp/diff-mode.el @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 11 Apr 2007 00:17:47 +0000 |
| parents | 91bf6e05918b 3a37aeee9537 |
| children | d7172f202ab8 |
comparison
equal
deleted
inserted
replaced
| 90795:b9182b6a90c9 | 90796:4ef881a120fe |
|---|---|
| 983 | 983 |
| 984 ;;;###autoload | 984 ;;;###autoload |
| 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 |
| 993 headers for you on-the-fly. | 992 headers for you on-the-fly. |
| 994 | 993 |
| 995 You can also switch between context diff and unified diff with \\[diff-context->unified], | 994 You can also switch between context diff and unified diff with \\[diff-context->unified], |
| 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 | |
| 999 When the buffer is read-only, the Meta- modifier is not necessary | |
| 1000 to run the Diff mode commands: | |
| 1001 | 997 |
| 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) |
| 1005 (set (make-local-variable 'outline-regexp) diff-outline-regexp) | 1001 (set (make-local-variable 'outline-regexp) diff-outline-regexp) |