mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix

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

Conflicts:
	diff.c
This commit is contained in:
Junio C Hamano 2008-09-20 18:36:22 -07:00
commit 92bb978541
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -1421,8 +1421,10 @@ static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
{ "python", "^[ \t]*((class|def)[ \t].*)$", REG_EXTENDED }, { "python", "^[ \t]*((class|def)[ \t].*)$", REG_EXTENDED },
{ "ruby", "^[ \t]*((class|module|def)[ \t].*)$", { "ruby", "^[ \t]*((class|module|def)[ \t].*)$",
REG_EXTENDED }, REG_EXTENDED },
{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
REG_EXTENDED },
{ "tex", { "tex",
"^(\\\\((sub)*section|chapter|part)\\*{0,1}\{.*)$", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
REG_EXTENDED }, REG_EXTENDED },
}; };