git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Brandon Casey <casey@nrlssc.navy.mil>
Subject: [PATCH] diff funcname_pattern: Allow HTML header tags without attributes
Date: Tue, 23 Sep 2008 02:49:23 +0200	[thread overview]
Message-ID: <200809230249.23298.johan@herland.net> (raw)
In-Reply-To: <CTXDOuN2-1v4gLJ9IqQwhgSzVh_BwEQIV70MoNH_beVI1QE7-TLy7g@cipher.nrlssc.navy.mil>

Signed-off-by: Johan Herland <johan@herland.net>
---

On Tuesday 23 September 2008, Brandon Casey wrote:
> And then this goes on top of bc/master-diff-hunk-header once
> bc/maint-diff-hunk-header with the previous patch is merged in.

After looking over this once more, I think the HTML regexp should be
changed as follows. This fixes a buglet that was part of my original
HTML pattern, and although this patch textually depends on Brandon's
work, it is conceptually independent of his refactorization.


Have fun!

...Johan

 diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/diff.c b/diff.c
index d0e7319..c8b72f4 100644
--- a/diff.c
+++ b/diff.c
@@ -1424,7 +1424,7 @@ static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
 	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
 	  REG_EXTENDED },
-	{ "html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", REG_EXTENDED },
+	{ "html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$", REG_EXTENDED },
 	{ "java",
 	  "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
 	  "^[ \t]*(([ \t]*[A-Za-z_][A-Za-z_0-9]*){2,}[ \t]*\\([^;]*)$",
-- 
1.6.0.2.405.g3cc38

  reply	other threads:[~2008-09-23  0:51 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <7vskry1485.fsf@gitster.siamese.dyndns.org>
2008-09-18 22:40 ` [PATCH v2 1/4] diff.c: return pattern entry pointer rather than just the hunk header pattern Brandon Casey
2008-09-19 18:14   ` Boyd Lynn Gerber
2008-09-19 19:11     ` Brandon Casey
2008-09-18 22:42 ` [PATCH v2 2/4] diff.c: associate a flag with each pattern and use it for compiling regex Brandon Casey
2008-09-18 22:44 ` [PATCH v2 3/4] diff.*.xfuncname which uses "extended" regex's for hunk header selection Brandon Casey
2008-09-18 22:47 ` [PATCH v2 4/4] diff.c: convert builtin funcname patterns to non-GNU extended regex syntax Brandon Casey
2008-09-18 22:59   ` Brandon Casey
2008-09-19 15:59     ` Brandon Casey
2008-09-18 23:40   ` Johan Herland
2008-09-19 15:55     ` Brandon Casey
2008-09-19 20:29   ` Junio C Hamano
2008-09-20  6:58     ` Junio C Hamano
2008-09-20 21:03       ` Brandon Casey
2008-09-20 22:29         ` Junio C Hamano
2008-09-22 16:59           ` Brandon Casey
2008-09-24  0:04             ` Brandon Casey
2008-09-26 17:49               ` Brandon Casey
2008-09-29 21:52                 ` [PATCH] diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785 Brandon Casey
2008-09-22 23:19       ` [PATCH bc/maint-diff-hunk-header] t4018-diff-funcname: test syntax of builtin xfuncname patterns Brandon Casey
2008-09-22 23:26         ` [PATCH bc/master-diff-hunk-header] " Brandon Casey
2008-09-23  0:49           ` Johan Herland [this message]
2008-09-23  1:46             ` [PATCH] diff funcname_pattern: Allow HTML header tags without attributes Junio C Hamano
2008-09-23  2:05               ` Johan Herland
2008-09-20  7:02     ` [PATCH v2 4/4] diff.c: convert builtin funcname patterns to non-GNU extended regex syntax Junio C Hamano
2008-09-20  7:51       ` Junio C Hamano
2008-09-22  8:29   ` Gustaf Hendeby

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=200809230249.23298.johan@herland.net \
    --to=johan@herland.net \
    --cc=casey@nrlssc.navy.mil \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).