summaryrefslogtreecommitdiff
path: root/runtime/doc/diff.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-03 19:13:34 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-03 19:13:34 +0100
commit0122c4070f84e71f15a39fb20ababeffb70757c4 (patch)
tree3849d34c18c14b9fd2ca465269515a887843d947 /runtime/doc/diff.txt
parentc0a37b9db38e722b9e5ac3ac8b4c4af86bdf018c (diff)
downloadvim-git-0122c4070f84e71f15a39fb20ababeffb70757c4.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r--runtime/doc/diff.txt15
1 files changed, 14 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index be17b0c73..492327358 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.4. Last change: 2014 Oct 31
+*diff.txt* For Vim version 7.4. Last change: 2015 Feb 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -314,6 +314,19 @@ name or a part of a buffer name. Examples:
Also see |'diffopt'| and the "diff" item of |'fillchars'|.
+ *diff-slow* *diff_translations*
+For very long lines, the diff syntax highlighting might be slow, especially
+since it tries to match all different kind of localisations. To disable
+localisations and speed up the syntax highlighting, set the global variable
+g:diff_translations to zero: >
+
+ let g:diff_translations = 0
+<
+After setting this variable, Reload the syntax script: >
+
+ set syntax=diff
+<
+
FINDING THE DIFFERENCES *diff-diffexpr*