summaryrefslogtreecommitdiff
path: root/runtime/syntax/diff.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-08-03 23:00:38 +0200
committerBram Moolenaar <Bram@vim.org>2010-08-03 23:00:38 +0200
commit5aae419afe8f6b20de0c34fc5ebc7a04ed8a68ce (patch)
treea29ae2eae84bc9351a00810c3947d07c89b62da7 /runtime/syntax/diff.vim
parent245803840b3f2537502d2d6de5132e2c6ee46b0c (diff)
downloadvim-git-5aae419afe8f6b20de0c34fc5ebc7a04ed8a68ce.tar.gz
Runtime file updates.
Diffstat (limited to 'runtime/syntax/diff.vim')
-rw-r--r--runtime/syntax/diff.vim6
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 8ec6880da..7bb67afd0 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Diff (context or unified)
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Jun 20
+" Last Change: 2010 Aug 03
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -16,6 +16,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: .*"
+" German
+syn match diffOnly "^Nur in .*"
+
syn match diffRemoved "^-.*"
syn match diffRemoved "^<.*"
syn match diffAdded "^+.*"
@@ -26,6 +29,7 @@ syn match diffSubname " @@..*"ms=s+3 contained
syn match diffLine "^@.*" contains=diffSubname
syn match diffLine "^\<\d\+\>.*"
syn match diffLine "^\*\*\*\*.*"
+syn match diffLine "^---$"
"Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*"