Mercurial > vim

comparison runtime/syntax/diff.vim @ 2479:f8f81a88a047 vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Runtime file updates.
author Bram Moolenaar <bram@vim.org>
date Tue, 03 Aug 2010 23:00:38 +0200
parents 7033303ea0c0
children 075efa5e166d
comparison
equal deleted inserted replaced
2478:11def19fbb0e 2479:f8f81a88a047
1 " Vim syntax file 1 " Vim syntax file
2 " Language: Diff (context or unified) 2 " Language: Diff (context or unified)
3 " Maintainer: Bram Moolenaar <Bram@vim.org> 3 " Maintainer: Bram Moolenaar <Bram@vim.org>
4 " Last Change: 2005 Jun 20 4 " Last Change: 2010 Aug 03
5 5
6 " Quit when a (custom) syntax file was already loaded 6 " Quit when a (custom) syntax file was already loaded
7 if exists("b:current_syntax") 7 if exists("b:current_syntax")
8 finish 8 finish
9 endif 9 endif
14 syn match diffBDiffer "^Binary files .* and .* differ$" 14 syn match diffBDiffer "^Binary files .* and .* differ$"
15 syn match diffIsA "^File .* is a .* while file .* is a .*" 15 syn match diffIsA "^File .* is a .* while file .* is a .*"
16 syn match diffNoEOL "^No newline at end of file .*" 16 syn match diffNoEOL "^No newline at end of file .*"
17 syn match diffCommon "^Common subdirectories: .*" 17 syn match diffCommon "^Common subdirectories: .*"
18 18
19 " German
20 syn match diffOnly "^Nur in .*"
21
19 syn match diffRemoved "^-.*" 22 syn match diffRemoved "^-.*"
20 syn match diffRemoved "^<.*" 23 syn match diffRemoved "^<.*"
21 syn match diffAdded "^+.*" 24 syn match diffAdded "^+.*"
22 syn match diffAdded "^>.*" 25 syn match diffAdded "^>.*"
23 syn match diffChanged "^! .*" 26 syn match diffChanged "^! .*"
24 27
25 syn match diffSubname " @@..*"ms=s+3 contained 28 syn match diffSubname " @@..*"ms=s+3 contained
26 syn match diffLine "^@.*" contains=diffSubname 29 syn match diffLine "^@.*" contains=diffSubname
27 syn match diffLine "^\<\d\+\>.*" 30 syn match diffLine "^\<\d\+\>.*"
28 syn match diffLine "^\*\*\*\*.*" 31 syn match diffLine "^\*\*\*\*.*"
32 syn match diffLine "^---$"
29 33
30 "Some versions of diff have lines like "#c#" and "#d#" (where # is a number) 34 "Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
31 syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*" 35 syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
32 36
33 syn match diffFile "^diff.*" 37 syn match diffFile "^diff.*"