X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fsyntax%2Fnotmuch-search.vim;h=71839fd9aef9a9b33a0fd6db9e1b4a40732e603b;hp=eb7d88fa30d45b1cb6b6a2bc2ae28945abfdd4cf;hb=a01e1335bea5fc583e1ab5e1a2ea8ad81ba725ce;hpb=3493ea0ed5bd20b961aafa01eeddaf8cbc49b52f

diff --git a/vim/syntax/notmuch-search.vim b/vim/syntax/notmuch-search.vim
index eb7d88fa..71839fd9 100644
--- a/vim/syntax/notmuch-search.vim
+++ b/vim/syntax/notmuch-search.vim
@@ -2,13 +2,14 @@
 
 " TODO: I cannot figure out why nmSearchTags is not matching anything :(
 
-syntax region nmSearchDate      start="^" end="\%13v"
-syntax region nmSearchCountAndFrom start="\%14v\[" end=";" oneline contains=nmSearchCount,nmSearchFrom
-syntax match  nmSearchFrom      ' .*;'                     contained
-syntax region nmSearchCount     start="\%14v\[" end="\]"   contained contains=nmSearchCountZero,nmSearchCountSome,nmSearchCountAll
+syntax region nmSearchDate      start='^' end='\%13v'      oneline
+syntax region nmSearchCountAndFrom start='\%14v\[' end='|' oneline contains=nmSearchCount,nmSearchFrom
+syntax region nmSearchCount     start='\[' end='\]'        oneline contained contains=nmSearchCountZero,nmSearchCountSome,nmSearchCountAll
+syntax region nmSearchFrom      start='\]\@<=' end='|'     oneline contained
 syntax match  nmSearchCountZero '0/\(\d\+\)'               contained
 syntax match  nmSearchCountSome '\([1-9]\d*\)/\(\d\+\)'    contained
 syntax match  nmSearchCountAll  '\(\d\+\)/\1'              contained
+syntax match  nmSearchSquareBracketText '\(\[\w\+\]\)'
 syntax match  nmSearchTags      /([^)]\+)$/
 
 highlight link nmSearchDate      Statement
@@ -17,6 +18,7 @@ highlight link nmSearchCountZero Function
 highlight link nmSearchCountSome Special
 highlight link nmSearchCountAll  Type
 highlight link nmSearchFrom      Include
+highlight link nmSearchSquareBracketText Special
 highlight link nmSearchTags      String
 
 highlight CursorLine term=reverse cterm=reverse gui=reverse