From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 00:41:17 +0000 (-0800)
Subject: Merge branch 'tr/diff-words-test'
X-Git-Tag: v1.7.5-rc0~141
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bb4abeff7e541ccfd7c87f5369b090829346e68;p=git.git

Merge branch 'tr/diff-words-test'

* tr/diff-words-test:
  t4034 (diff --word-diff): add a minimum Perl drier test vector
  t4034 (diff --word-diff): style suggestions
  userdiff: simplify word-diff safeguard
  t4034: bulk verify builtin word regex sanity
---

1bb4abeff7e541ccfd7c87f5369b090829346e68
diff --cc userdiff.c
index 9ebf231ea,3a1c392bb..1ff47977d
--- a/userdiff.c
+++ b/userdiff.c
@@@ -49,10 -49,9 +49,9 @@@ PATTERNS("objc"
  	 /* -- */
  	 "[a-zA-Z_][a-zA-Z0-9_]*"
  	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
- 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"
- 	 "|[^[:space:]]|[\x80-\xff]+"),
+ 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
  PATTERNS("pascal",
 -	 "^((procedure|function|constructor|destructor|interface|"
 +	 "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
  		"implementation|initialization|finalization)[ \t]*.*)$"
  	 "\n"
  	 "^(.*=[ \t]*(class|record).*)$",