diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-17 15:23:35 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-17 15:23:35 -0500 |
| commit | ecdf18edbbb636d06c888c0fe28d04cc102d6f57 (patch) | |
| tree | b817949807a29f36f66b2f1f642688a2e88d7e18 /runtime/doc/diff.txt | |
| parent | 5b30ba7b999dc6af7e429c9a25167515f937cd66 (diff) | |
| parent | cb0b89f8bad0a6c2b05940d7ed55d0970f823926 (diff) | |
| download | rneovim-ecdf18edbbb636d06c888c0fe28d04cc102d6f57.tar.gz rneovim-ecdf18edbbb636d06c888c0fe28d04cc102d6f57.tar.bz2 rneovim-ecdf18edbbb636d06c888c0fe28d04cc102d6f57.zip | |
Merge pull request #3860 from justinmk/vim-0122c40
vim-patch:0122c40
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 54d47eb28a..8c9cdc3800 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4. Last change: 2015 Jan 19 +*diff.txt* For Vim version 7.4. Last change: 2015 Feb 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -306,6 +306,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* |