Fix whitespace and remove obsolete gitattributes entry

petere · petere · commit 96adb14d931e · 2016-03-13T16:03:13.000-04:00
diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,6 @@ contrib/tsearch2/sql/tsearch2.sql		whitespace=space-before-tab,blank-at-eof,-bla
 contrib/pgcrypto/sql/pgp-armor.sql		whitespace=-blank-at-eol
 doc/bug.template				whitespace=space-before-tab,-blank-at-eof,blank-at-eol
 src/backend/catalog/sql_features.txt		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
-src/backend/tsearch/hunspell_sample.affix	whitespace=-blank-at-eof
 
 # Test output files that contain extra whitespace
 *.out					-whitespace
diff --git a/src/backend/tsearch/dicts/hunspell_sample.affix b/src/backend/tsearch/dicts/hunspell_sample.affix
@@ -21,4 +21,3 @@ SFX A   Y	IES	[^AEIOU]Y
 
 SFX \ N 1
 SFX \   0	Y/L	[^Y]
-
diff --git a/src/backend/tsearch/dicts/hunspell_sample_long.affix b/src/backend/tsearch/dicts/hunspell_sample_long.affix
@@ -32,4 +32,3 @@ SFX sA   Y	IES	[^AEIOU]Y
 
 SFX s\ N 1
 SFX s\   0	Y/2	[^Y]
-
diff --git a/src/backend/tsearch/dicts/hunspell_sample_num.affix b/src/backend/tsearch/dicts/hunspell_sample_num.affix
@@ -23,4 +23,3 @@ SFX 304   Y	IES	[^AEIOU]Y
 
 SFX 305 N 1
 SFX 305   0	Y/102	[^Y]
-
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
@@ -1177,7 +1177,7 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 					ereport(ERROR,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
 						 errmsg("Ispell dictionary supports only default, "
-						 		"long and num flag value")));
+								"long and num flag value")));
 			}
 		}
 
diff --git a/src/test/regress/sql/tstypes.sql b/src/test/regress/sql/tstypes.sql
@@ -157,4 +157,3 @@ SELECT setweight('a asd w:5,6,12B,13A zxc'::tsvector, 'c', ARRAY['a', 'zxc', NUL
 SELECT filter('base:7A empir:17 evil:15 first:11 galact:16 hidden:6A rebel:1A spaceship:2A strike:3A victori:12 won:9'::tsvector, '{a}');
 SELECT filter('base hidden rebel spaceship strike'::tsvector, '{a}');
 SELECT filter('base hidden rebel spaceship strike'::tsvector, '{a,b,NULL}');
-

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,3 @@ SFX A Y IES [^AEIOU]Y`
`21`	`21`
`22`	`22`	`SFX \ N 1`
`23`	`23`	`SFX \ 0 Y/L [^Y]`
`24`		`-`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,3 @@ SFX sA Y IES [^AEIOU]Y`
`32`	`32`
`33`	`33`	`SFX s\ N 1`
`34`	`34`	`SFX s\ 0 Y/2 [^Y]`
`35`		`-`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,3 @@ SFX 304 Y IES [^AEIOU]Y`
`23`	`23`
`24`	`24`	`SFX 305 N 1`
`25`	`25`	`SFX 305 0 Y/102 [^Y]`
`26`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1177,7 +1177,7 @@ NIImportOOAffixes(IspellDict Conf, const char filename)`
`1177`	`1177`	`ereport(ERROR,`
`1178`	`1178`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`1179`	`1179`	`errmsg("Ispell dictionary supports only default, "`
`1180`		`- "long and num flag value")));`
	`1180`	`+ "long and num flag value")));`
`1181`	`1181`	`}`
`1182`	`1182`	`}`
`1183`	`1183`