Skip to content

Commit

Permalink
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk…
Browse files Browse the repository at this point in the history
…-header-fix

* bc/maint-diff-hunk-header-fix:
  diff hunk pattern: fix misconverted "\{" tex macro introducers

Conflicts:
	diff.c
  • Loading branch information
Junio C Hamano committed Sep 21, 2008
2 parents 3d8dccd + 96d1a8e commit 92bb978
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -1421,8 +1421,10 @@ static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
{ "python", "^[ \t]*((class|def)[ \t].*)$", REG_EXTENDED },
{ "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
REG_EXTENDED },
{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
REG_EXTENDED },
{ "tex",
"^(\\\\((sub)*section|chapter|part)\\*{0,1}\{.*)$",
"^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
REG_EXTENDED },
};

Expand Down

0 comments on commit 92bb978

Please sign in to comment.