28/9fa8a88e242389dff0b1655a0fea22d0021e13

   1 Return-Path: <felipe.contreras@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 302C441733F\r
   6         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:14:12 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -1.999\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-1.999 tagged_above=-999 required=5\r
  12         tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
  13         DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001]\r
  14         autolearn=ham\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id qVS+CeyaW0n9 for <notmuch@notmuchmail.org>;\r
  18         Sat,  5 Jun 2010 04:13:58 -0700 (PDT)\r
  19 Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.153])\r
  20         by olra.theworths.org (Postfix) with ESMTP id 1FED44196F0\r
  21         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:11 -0700 (PDT)\r
  22 Received: by fg-out-1718.google.com with SMTP id 16so725077fgg.2\r
  23         for <notmuch@notmuchmail.org>; Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
  24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  25         h=domainkey-signature:received:received:from:to:cc:subject:date\r
  26         :message-id:x-mailer:in-reply-to:references;\r
  27         bh=cqKTRMbztKvPq77GYBEH8tynZZhnyUWeFPvInwrK2oM=;\r
  28         b=e/j5qdk+erxs4ipcxTfG/H462ee17cOPK22HHH3L3HstIBtONUd6yVvTlnqwlRRnJE\r
  29         IqQfDWlZmVvY76K8ztpMQOkGSbsgQsQOGwa5GPjMwzJZAfb8oURZ9YnHJ9Xd7bQ8NdRt\r
  30         rzyl6qqRrFJYeUn/T3SBVPAyF17SDoIiXg4tU=\r
  31 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  32         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  33         b=X26LNODXMy5BgRFNH2akedQRVX9yDc6wElmAmsPgMh+YwVOQoFJdoxHJFKFm1x8BVv\r
  34         LlYRRB9iqsand2n8R2s8ddEqRqnFBqsY8Q6aRaV0yUb/JiLIDtLqI7qoJFh6zuvE1g51\r
  35         geeF6kHD9UJjin6QiBiVdYqB7W5KsSOt0yP4s=\r
  36 Received: by 10.204.47.20 with SMTP id l20mr4861320bkf.132.1275736390304;\r
  37         Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
  38 Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80])\r
  39         by mx.google.com with ESMTPS id z20sm9603484bkx.3.2010.06.05.04.13.09\r
  40         (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
  41         Sat, 05 Jun 2010 04:13:10 -0700 (PDT)\r
  42 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 9/9] vim: include own improved git-diff syntax\r
  45 Date: Sat,  5 Jun 2010 14:12:42 +0300\r
  46 Message-Id: <1275736362-22771-10-git-send-email-felipe.contreras@gmail.com>\r
  47 X-Mailer: git-send-email 1.7.1\r
  48 In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  49 References: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  50 Cc: Bart Trojanowski <bart@jukie.net>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Sat, 05 Jun 2010 11:14:12 -0000\r
  64 \r
  65 The old one wasn't working at all on newer vims.\r
  66 \r
  67 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  68 ---\r
  69  vim/README                      |    5 -----\r
  70  vim/syntax/notmuch-git-diff.vim |   26 ++++++++++++++++++++++++++\r
  71  vim/syntax/notmuch-show.vim     |    3 +--\r
  72  3 files changed, 27 insertions(+), 7 deletions(-)\r
  73  create mode 100644 vim/syntax/notmuch-git-diff.vim\r
  74 \r
  75 diff --git a/vim/README b/vim/README\r
  76 index 0807166..12ad2bb 100644\r
  77 --- a/vim/README\r
  78 +++ b/vim/README\r
  79 @@ -10,11 +10,6 @@ Dependencies:\r
  80      mailx:\r
  81          To send mail, notmuch.vim uses the UNIX mailx command.\r
  82  \r
  83 -    git-diff:\r
  84 -        The vim interface makes use of the git-diff.vim syntax file\r
  85 -        which is available from\r
  86 -            http://github.com/motemen/git-vim/blob/master/syntax/git-diff.vim\r
  87 -\r
  88  \r
  89  To install:\r
  90          make install\r
  91 diff --git a/vim/syntax/notmuch-git-diff.vim b/vim/syntax/notmuch-git-diff.vim\r
  92 new file mode 100644\r
  93 index 0000000..6f15fdc\r
  94 --- /dev/null\r
  95 +++ b/vim/syntax/notmuch-git-diff.vim\r
  96 @@ -0,0 +1,26 @@\r
  97 +syn match diffRemoved  "^-.*"\r
  98 +syn match diffAdded    "^+.*"\r
  99 +\r
 100 +syn match diffSeparator        "^---$"\r
 101 +syn match diffSubname  " @@..*"ms=s+3 contained\r
 102 +syn match diffLine     "^@.*" contains=diffSubname\r
 103 +\r
 104 +syn match diffFile     "^diff .*"\r
 105 +syn match diffNewFile  "^+++ .*"\r
 106 +syn match diffOldFile  "^--- .*"\r
 107 +\r
 108 +hi def link diffOldFile                diffFile\r
 109 +hi def link diffNewFile                diffFile\r
 110 +\r
 111 +hi def link diffFile           Type\r
 112 +hi def link diffRemoved                Special\r
 113 +hi def link diffAdded          Identifier\r
 114 +hi def link diffLine           Statement\r
 115 +hi def link diffSubname                PreProc\r
 116 +\r
 117 +syntax match gitDiffStatLine /^ .\{-}\zs[+-]\+$/ contains=gitDiffStatAdd,gitDiffStatDelete\r
 118 +syntax match gitDiffStatAdd    /+/ contained\r
 119 +syntax match gitDiffStatDelete /-/ contained\r
 120 +\r
 121 +hi def link gitDiffStatAdd diffAdded\r
 122 +hi def link gitDiffStatDelete diffRemoved\r
 123 diff --git a/vim/syntax/notmuch-show.vim b/vim/syntax/notmuch-show.vim\r
 124 index 20bcc39..c3a98b7 100644\r
 125 --- a/vim/syntax/notmuch-show.vim\r
 126 +++ b/vim/syntax/notmuch-show.vim\r
 127 @@ -12,8 +12,7 @@ syntax match   nmShowMsgHeadVal /^\([^:]\+: \)\@<=.*/ contained\r
 128  syntax cluster nmShowMsgBody contains=@nmShowMsgBodyMail,@nmShowMsgBodyGit\r
 129  syntax include @nmShowMsgBodyMail syntax/mail.vim\r
 130  \r
 131 -" git-diff.vim marks up diffs in emails, see README for details\r
 132 -silent! syntax include @nmShowMsgBodyGit syntax/git-diff.vim\r
 133 +silent! syntax include @nmShowMsgBodyGit syntax/notmuch-git-diff.vim\r
 134  \r
 135  highlight nmShowMsgDescWho term=reverse cterm=reverse gui=reverse\r
 136  highlight link nmShowMsgDescDate Type\r
 137 -- \r
 138 1.7.1\r
 139 \r