aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
authorChong Yidong2007-04-06 18:45:34 +0000
committerChong Yidong2007-04-06 18:45:34 +0000
commit6035b97e5c285a9e86e4f7bc99c60a5cf4c89b4e (patch)
treee16dd0cd6a9621dff430e6a2f3c3e733afb26bd2 /lisp/diff-mode.el
parenta8cf60899a2cab7b06566f22416d04d7c49f1ee0 (diff)
downloademacs-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.el6
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.
987Supports unified and context diffs as well as (to a lesser extent) 987Supports unified and context diffs as well as (to a lesser extent)
988normal diffs. If you edit the buffer manually, diff-mode will try 988normal diffs.
989to update the hunk headers for you on-the-fly.
990 989
991When the buffer is read-only, the ESC prefix is not necessary. 990When the buffer is read-only, the ESC prefix is not necessary.
992If you edit the buffer manually, diff-mode will try to update the hunk 991If 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->
996or vice versa with \\[diff-unified->context] and you can also reverse the direction of 995or vice versa with \\[diff-unified->context] and you can also reverse the direction of
997a diff with \\[diff-reverse-direction]. 996a diff with \\[diff-reverse-direction].
998 997
999When the buffer is read-only, the Meta- modifier is not necessary
1000to 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)