[PATCH 9/9] vim: include own improved git-diff syntax

diff --git a/28/9fa8a88e242389dff0b1655a0fea22d0021e13 b/28/9fa8a88e242389dff0b1655a0fea22d0021e13
new file mode 100644 (file)
index 0000000..03218ad
--- /dev/null
+++ b/28/9fa8a88e242389dff0b1655a0fea22d0021e13
@@ -0,0 +1,139 @@
+Return-Path: <felipe.contreras@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 302C441733F\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:14:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.999\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.999 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+       DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id qVS+CeyaW0n9 for <notmuch@notmuchmail.org>;\r
+       Sat,  5 Jun 2010 04:13:58 -0700 (PDT)\r
+Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.153])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1FED44196F0\r
+       for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:11 -0700 (PDT)\r
+Received: by fg-out-1718.google.com with SMTP id 16so725077fgg.2\r
+       for <notmuch@notmuchmail.org>; Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:received:received:from:to:cc:subject:date\r
+       :message-id:x-mailer:in-reply-to:references;\r
+       bh=cqKTRMbztKvPq77GYBEH8tynZZhnyUWeFPvInwrK2oM=;\r
+       b=e/j5qdk+erxs4ipcxTfG/H462ee17cOPK22HHH3L3HstIBtONUd6yVvTlnqwlRRnJE\r
+       IqQfDWlZmVvY76K8ztpMQOkGSbsgQsQOGwa5GPjMwzJZAfb8oURZ9YnHJ9Xd7bQ8NdRt\r
+       rzyl6qqRrFJYeUn/T3SBVPAyF17SDoIiXg4tU=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       b=X26LNODXMy5BgRFNH2akedQRVX9yDc6wElmAmsPgMh+YwVOQoFJdoxHJFKFm1x8BVv\r
+       LlYRRB9iqsand2n8R2s8ddEqRqnFBqsY8Q6aRaV0yUb/JiLIDtLqI7qoJFh6zuvE1g51\r
+       geeF6kHD9UJjin6QiBiVdYqB7W5KsSOt0yP4s=\r
+Received: by 10.204.47.20 with SMTP id l20mr4861320bkf.132.1275736390304;\r
+       Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
+Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80])\r
+       by mx.google.com with ESMTPS id z20sm9603484bkx.3.2010.06.05.04.13.09\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 9/9] vim: include own improved git-diff syntax\r
+Date: Sat,  5 Jun 2010 14:12:42 +0300\r
+Message-Id: <1275736362-22771-10-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.7.1\r
+In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
+Cc: Bart Trojanowski <bart@jukie.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 05 Jun 2010 11:14:12 -0000\r
+\r
+The old one wasn't working at all on newer vims.\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/README                      |    5 -----\r
+ vim/syntax/notmuch-git-diff.vim |   26 ++++++++++++++++++++++++++\r
+ vim/syntax/notmuch-show.vim     |    3 +--\r
+ 3 files changed, 27 insertions(+), 7 deletions(-)\r
+ create mode 100644 vim/syntax/notmuch-git-diff.vim\r
+\r
+diff --git a/vim/README b/vim/README\r
+index 0807166..12ad2bb 100644\r
+--- a/vim/README\r
++++ b/vim/README\r
+@@ -10,11 +10,6 @@ Dependencies:\r
+     mailx:\r
+         To send mail, notmuch.vim uses the UNIX mailx command.\r
+ \r
+-    git-diff:\r
+-        The vim interface makes use of the git-diff.vim syntax file\r
+-        which is available from\r
+-            http://github.com/motemen/git-vim/blob/master/syntax/git-diff.vim\r
+-\r
+ \r
+ To install:\r
+         make install\r
+diff --git a/vim/syntax/notmuch-git-diff.vim b/vim/syntax/notmuch-git-diff.vim\r
+new file mode 100644\r
+index 0000000..6f15fdc\r
+--- /dev/null\r
++++ b/vim/syntax/notmuch-git-diff.vim\r
+@@ -0,0 +1,26 @@\r
++syn match diffRemoved "^-.*"\r
++syn match diffAdded   "^+.*"\r
++\r
++syn match diffSeparator       "^---$"\r
++syn match diffSubname " @@..*"ms=s+3 contained\r
++syn match diffLine    "^@.*" contains=diffSubname\r
++\r
++syn match diffFile    "^diff .*"\r
++syn match diffNewFile "^+++ .*"\r
++syn match diffOldFile "^--- .*"\r
++\r
++hi def link diffOldFile               diffFile\r
++hi def link diffNewFile               diffFile\r
++\r
++hi def link diffFile          Type\r
++hi def link diffRemoved               Special\r
++hi def link diffAdded         Identifier\r
++hi def link diffLine          Statement\r
++hi def link diffSubname               PreProc\r
++\r
++syntax match gitDiffStatLine /^ .\{-}\zs[+-]\+$/ contains=gitDiffStatAdd,gitDiffStatDelete\r
++syntax match gitDiffStatAdd    /+/ contained\r
++syntax match gitDiffStatDelete /-/ contained\r
++\r
++hi def link gitDiffStatAdd diffAdded\r
++hi def link gitDiffStatDelete diffRemoved\r
+diff --git a/vim/syntax/notmuch-show.vim b/vim/syntax/notmuch-show.vim\r
+index 20bcc39..c3a98b7 100644\r
+--- a/vim/syntax/notmuch-show.vim\r
++++ b/vim/syntax/notmuch-show.vim\r
+@@ -12,8 +12,7 @@ syntax match   nmShowMsgHeadVal /^\([^:]\+: \)\@<=.*/ contained\r
+ syntax cluster nmShowMsgBody contains=@nmShowMsgBodyMail,@nmShowMsgBodyGit\r
+ syntax include @nmShowMsgBodyMail syntax/mail.vim\r
+ \r
+-" git-diff.vim marks up diffs in emails, see README for details\r
+-silent! syntax include @nmShowMsgBodyGit syntax/git-diff.vim\r
++silent! syntax include @nmShowMsgBodyGit syntax/notmuch-git-diff.vim\r
+ \r
+ highlight nmShowMsgDescWho term=reverse cterm=reverse gui=reverse\r
+ highlight link nmShowMsgDescDate Type\r
+-- \r
+1.7.1\r
+\r