git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] contrib/vim: update syntax for changed commit template
@ 2007-01-23  3:21 Jeff King
  0 siblings, 0 replies; only message in thread
From: Jeff King @ 2007-01-23  3:21 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Juergen Ruehle, git


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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-01-23  3:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-23  3:21 [PATCH] contrib/vim: update syntax for changed commit template Jeff King

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).