From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Bart Trojanowski <bart@jukie.net>
Subject: [PATCH 9/9] vim: include own improved git-diff syntax
Date: Sat, 5 Jun 2010 14:12:42 +0300 [thread overview]
Message-ID: <1275736362-22771-10-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>
The old one wasn't working at all on newer vims.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
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
next prev parent reply other threads:[~2010-06-05 11:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 11:12 [PATCH 0/9] vim improvements Felipe Contreras
2010-06-05 11:12 ` [PATCH 1/9] thread: really clean authors Felipe Contreras
2010-06-05 11:12 ` [PATCH 2/9] vim: add archive support from 'show' Felipe Contreras
2010-06-05 11:12 ` [PATCH 3/9] vim: cleanup search buffer Felipe Contreras
2010-06-05 11:12 ` [PATCH 4/9] vim: cleanup search syntax Felipe Contreras
2010-06-05 11:12 ` [PATCH 5/9] vim: remove add_remove_tags_on_screen() Felipe Contreras
2010-06-05 11:12 ` [PATCH 6/9] vim: add option to mark as read + archive Felipe Contreras
2010-06-05 11:12 ` [PATCH 7/9] vim: use mailx for sending Felipe Contreras
2010-06-16 18:28 ` Felipe Contreras
2010-06-05 11:12 ` [PATCH 8/9] vim: run(): optimize non-debug path Felipe Contreras
2010-06-05 11:12 ` Felipe Contreras [this message]
2010-11-08 17:57 ` [PATCH 0/9] vim improvements Carl Worth
2010-11-08 18:04 ` Carl Worth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275736362-22771-10-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=bart@jukie.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).