diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-19 17:49:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-19 17:49:42 -0800 |
| commit | f29db856e7a736dd5109223d71c548367bc127ae (patch) | |
| tree | f4ae1561dcf0fe8914a95b1beceb970fb10ec3fa /userdiff.c | |
| parent | t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge (diff) | |
| parent | gitweb: Include links to feeds in HTML header only for '200 OK' response (diff) | |
| download | tgif-f29db856e7a736dd5109223d71c548367bc127ae.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Include links to feeds in HTML header only for '200 OK' response
fsck docs: remove outdated and useless diagnostic
userdiff: fix typo in ruby and python word regexes
trace.c: mark file-local function static
Fix typo in git-gc document.
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/userdiff.c b/userdiff.c index f9e05b548c..2d5453697a 100644 --- a/userdiff.c +++ b/userdiff.c @@ -74,14 +74,14 @@ PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$", "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|//=?|<<=?|>>=?|\\*\\*=?" - "|[^[:space:]|[\x80-\xff]+"), + "|[^[:space:]]|[\x80-\xff]+"), /* -- */ PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$", /* -- */ "(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?." "|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~" - "|[^[:space:]|[\x80-\xff]+"), + "|[^[:space:]]|[\x80-\xff]+"), PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$", "[={}\"]|[^={}\" \t]+"), PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$", |