diff --git a/.gitattributes b/.gitattributes
index 9466800e12..4dfc13112e 100644
--- 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
index d1984c295f..9a6451307c 100644
--- 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
index d8e60493ad..fc0d485a4d 100644
--- 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
index ba1e8f8002..5f2f8e9bca 100644
--- 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
index 304504e7d0..d67aa2c122 100644
--- 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
index db62c5460d..38b7f65c25 100644
--- 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}');
-