--- syntax/bzr.vim	2009-02-02 11:51:03.639294200 +0000
+++ /usr/share/vim/vim72/syntax/bzr.vim	2008-10-09 14:53:50.001000000 +0100
@@ -2,7 +2,7 @@
 " Language:     Bazaar (bzr) commit file
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot spb dot ru>
 " URL:          http://www.hlabs.spb.ru/vim/bzr.vim
-" Revision:     $Id: bzr.vim,v 1.9 2008/08/09 17:39:43 vimboss Exp $
+" Revision:     $Id: bzr.vim 683 2008-07-30 11:52:38Z hdima $
 " Filenames:    bzr_log.*
 " Version:      1.1
 
@@ -14,28 +14,15 @@
   finish
 endif
 
-syn region bzrModified     start="^modified:$"he=e-1   end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrModifiedItem
-syn match  bzrModifiedItem "^  .*"hs=s+2
+syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=ALL contains=@NoSpell
+syn match bzrRemoved   "^removed:$" contained
+syn match bzrAdded     "^added:$" contained
+syn match bzrRenamed   "^renamed:$" contained
+syn match bzrModified  "^modified:$" contained
+syn match bzrUnchanged "^unchanged:$" contained
+syn match bzrUnknown   "^unknown:$" contained
 
-syn region bzrRemoved       start="^removed:$"he=e-1   end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrRemovedItem
-syn match  bzrRemovedItem   "^  .*"hs=s+2
-syn region bzrAdded         start="^added:$"he=e-1     end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrAddedItem
-syn match  bzrAddedItem     "^  .*"hs=s+2
-syn region bzrRenamed       start="^renamed:$"he=e-1   end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrRenamedItem
-syn match  bzrRenamedItem   "^  .*"hs=s+2
-syn region bzrUnchanged     start="^unchanged:$"he=e-1 end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrUnchangedItem
-syn match  bzrUnchangedItem "^  .*"hs=s+2
-syn region bzrUnknown       start="^unknown:$"he=e-1   end="\n\S"re=s-1,me=s-1,he=s-1 contained contains=bzrUnknownItem
-syn match  bzrUnknownItem   "^  .*"hs=s+2
-
-syn include @Diff syntax/diff.vim
-syn region bzrDiff start="^===" end="\%$" contained contains=@Diff
-
-syn cluster bzrParts contains=bzrRemoved,bzrAdded,bzrRenamed,bzrModified,bzrUnchanged,bzrUnknown,bzrDiff
-
-syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=@bzrParts contains=@NoSpell
-
-" Synchronisation.
+" Synchronization.
 syn sync clear
 syn sync match bzrSync  grouphere bzrRegion "^-\{14} This line and the following will be ignored -\{14}$"me=s-1
 
@@ -58,13 +45,6 @@
   HiLink bzrUnchanged  Special
   HiLink bzrUnknown    Special
 
-  HiLink bzrModifiedItem  Keyword
-  HiLink bzrRemovedItem   Keyword
-  HiLink bzrAddedItem     Keyword
-  HiLink bzrRenamedItem   Keyword
-  HiLink bzrUnchangedItem Keyword
-  HiLink bzrUnknownItem   Keyword
-
   delcommand HiLink
 endif