vim: add git-diff.vim in README, make syntax work w/o the script

diff --git a/vim/README b/vim/README
index 9f1ff57138e491526df7dcd337142be4714da7ae..02bd3e65ac4d345d4a931c6007f4fbfef866e8f8 100644 (file)
--- a/vim/README
+++ b/vim/README
@@ -3,15 +3,22 @@ through vim.
 
 NOTE: this is a work in progress.  Patches welcome. <bart@jukie.net>
 
 
 NOTE: this is a work in progress.  Patches welcome. <bart@jukie.net>
 

+The vim interface makes use of the git-diff.vim syntax file which is
+available from
+    http://github.com/motemen/git-vim/blob/master/syntax/git-diff.vim
+
+

 To install:
         make install
 
 To install:
         make install
 

+

 To run:
         vim -c ':NotMuch'
 
     from vim:
         :NotMuch
 
 To run:
         vim -c ':NotMuch'
 
     from vim:
         :NotMuch
 

+

 Buffer types:
     [notmuch-folders]
         Folder list, or technically a list of saved searches.
 Buffer types:
     [notmuch-folders]
         Folder list, or technically a list of saved searches.

diff --git a/vim/syntax/notmuch-show.vim b/vim/syntax/notmuch-show.vim
index 20c6b88feaa4a172c7f0b980126e013ba5de8685..20bcc3996d42c908c09e03c909105b241599cb1f 100644 (file)
--- a/vim/syntax/notmuch-show.vim
+++ b/vim/syntax/notmuch-show.vim
@@ -11,7 +11,9 @@ syntax match   nmShowMsgHeadVal /^\([^:]\+: \)\@<=.*/ contained
 
 syntax cluster nmShowMsgBody contains=@nmShowMsgBodyMail,@nmShowMsgBodyGit
 syntax include @nmShowMsgBodyMail syntax/mail.vim
 
 syntax cluster nmShowMsgBody contains=@nmShowMsgBodyMail,@nmShowMsgBodyGit
 syntax include @nmShowMsgBodyMail syntax/mail.vim

-syntax include @nmShowMsgBodyGit syntax/git-diff.vim
+
+" git-diff.vim marks up diffs in emails, see README for details
+silent! syntax include @nmShowMsgBodyGit syntax/git-diff.vim

 
 highlight nmShowMsgDescWho term=reverse cterm=reverse gui=reverse
 highlight link nmShowMsgDescDate Type
 
 highlight nmShowMsgDescWho term=reverse cterm=reverse gui=reverse
 highlight link nmShowMsgDescDate Type