diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-21 03:36:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-21 03:37:47 +0200 |
| commit | 92bb978541af02ac624d1b9aeec296691cc15734 (patch) | |
| tree | b303d263bdf8406f3d2ccc39c7ca5045c114dd07 /diff.c | |
| parent | diff: fix "multiple regexp" semantics to find hunk header comment (diff) | |
| parent | diff hunk pattern: fix misconverted "\{" tex macro introducers (diff) | |
| download | git-92bb978541af02ac624d1b9aeec296691cc15734.tar.xz git-92bb978541af02ac624d1b9aeec296691cc15734.zip | |
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix:
diff hunk pattern: fix misconverted "\{" tex macro introducers
Conflicts:
diff.c
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 }, }; |