diff options
| author | rosston <ross.brandes@appropos.com> | 2015-10-09 17:42:05 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-11 18:07:58 -0400 |
| commit | d69f3bbb0d3a0549466ac0e36a1364d1890b4691 (patch) | |
| tree | a7ee17fe865c63cccecee7cd514f96e08a0fdf38 /runtime/syntax/diff.vim | |
| parent | 57d3a2a52fea57874d08472d0f8ee8f1bcee87c1 (diff) | |
| download | rneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.tar.gz rneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.tar.bz2 rneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.zip | |
vim-patch:8feef4f #3444
Update runtime files.
https://github.com/vim/vim/commit/8feef4ff6253afb9dcc61c40082ed4fbb96b685c
Diffstat (limited to 'runtime/syntax/diff.vim')
| -rw-r--r-- | runtime/syntax/diff.vim | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index a0005140b2..ff69c5860b 100644 --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -2,7 +2,7 @@ " Language: Diff (context or unified) " Maintainer: Bram Moolenaar <Bram@vim.org> " Translations by Jakson Alves de Aquino. -" Last Change: 2014 Nov 12 +" Last Change: 2015 Jan 07 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -18,6 +18,9 @@ syn match diffIsA "^File .* is a .* while file .* is a .*" syn match diffNoEOL "^\\ No newline at end of file .*" syn match diffCommon "^Common subdirectories: .*" +" Disable the translations by setting diff_translations to zero. +if !exists("diff_translations") || diff_translations + " ca syn match diffOnly "^Només a .*" syn match diffIdentical "^Els fitxers .* i .* són idèntics$" @@ -320,6 +323,8 @@ syn match diffIsA "^檔案 .* 是.*而檔案 .* 是.*" syn match diffNoEOL "^\\ 檔案末沒有 newline 字元" syn match diffCommon "^.* 和 .* 有共同的副目錄$" +endif + syn match diffRemoved "^-.*" syn match diffRemoved "^<.*" |