summaryrefslogtreecommitdiff
path: root/runtime/syntax/diff.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-01-07 16:57:10 +0100
committerBram Moolenaar <Bram@vim.org>2015-01-07 16:57:10 +0100
commit8feef4ff6253afb9dcc61c40082ed4fbb96b685c (patch)
treeb4fcf5ee772cf6eb0ff932c0eb98a322a8c1c273 /runtime/syntax/diff.vim
parenta162bc555e74c1a4f1b7b49871e292e05141b054 (diff)
downloadvim-git-8feef4ff6253afb9dcc61c40082ed4fbb96b685c.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/syntax/diff.vim')
-rw-r--r--runtime/syntax/diff.vim7
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index a0005140b..ff69c5860 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 "^<.*"