From: Jeff King <peff@peff.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Juergen Ruehle <j.ruehle@bmiag.de>, git@vger.kernel.org
Subject: [PATCH] contrib/vim: update syntax for changed commit template
Date: Mon, 22 Jan 2007 22:21:15 -0500 [thread overview]
Message-ID: <20070123032115.GA20554@coredump.intra.peff.net> (raw)
Signed-off-by: Jeff King <peff@peff.net>
---
It looks like things have settled down here, so it would be nice to
apply this before v1.5.0 (though I still think "changed but not updated"
is terrible wording, my previous message to that effect received no
response).
On Thu, Jan 11, 2007 at 08:17:12AM +0100, Juergen Ruehle wrote:
> Thanks for tracking this. It would be nice if we could make the
> syntax highlighting less dependent on the exact wording.
Unfortunately, I don't see another way short of counting which "stanza"
we're in, and that is highly dependent on the formatting of stanzas, as
well as what the user might have written in his commit message. This way
is reasonably robust, and the messages shouldn't change too frequently.
contrib/vim/syntax/gitcommit.vim | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/vim/syntax/gitcommit.vim b/contrib/vim/syntax/gitcommit.vim
index d911efb..332121b 100644
--- a/contrib/vim/syntax/gitcommit.vim
+++ b/contrib/vim/syntax/gitcommit.vim
@@ -1,7 +1,7 @@
syn region gitLine start=/^#/ end=/$/
-syn region gitCommit start=/^# Added but not yet committed:$/ end=/^#$/ contains=gitHead,gitCommitFile
+syn region gitCommit start=/^# Changes to be committed:$/ end=/^#$/ contains=gitHead,gitCommitFile
syn region gitHead contained start=/^# (.*)/ end=/^#$/
-syn region gitChanged start=/^# Changed but not added:/ end=/^#$/ contains=gitHead,gitChangedFile
+syn region gitChanged start=/^# Changed but not updated:/ end=/^#$/ contains=gitHead,gitChangedFile
syn region gitUntracked start=/^# Untracked files:/ end=/^#$/ contains=gitHead,gitUntrackedFile
syn match gitCommitFile contained /^#\t.*/hs=s+2
--
1.5.0.rc1.gda86
reply other threads:[~2007-01-23 3:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070123032115.GA20554@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=j.ruehle@bmiag.de \
--cc=junkio@cox.net \
/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.
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 NNTP newsgroup(s).