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