Fix whitespace and remove obsolete gitattributes entry

diff --git a/.gitattributes b/.gitattributes
index 9466800e12ac478969684a1fc7d43258316d4f76..4dfc13112ef7c9e162492e1b0dbd3a4eaee6944b 100644 (file)
--- 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 d1984c295fbf0de7c9e5344d8ad1ec93525861d3..9a6451307c1d2f94b171d191c2ea2ecc4c29d73b 100644 (file)
--- 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 d8e60493ad42c7546c5042cf9e5e517e607ddafb..fc0d485a4d9209480719c08920e2ef8d6d5a62b8 100644 (file)
--- 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 ba1e8f8002a2488d74bd86999a8d6ba01c7115e4..5f2f8e9bca727fc76b48d54179769b0eadd58331 100644 (file)
--- 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 304504e7d0c4bea0fd33a75ad77d3e0941f778e0..d67aa2c122b7a8ec5e8eb2e21d3a68d29f8574f6 100644 (file)
--- 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 db62c5460da34baa4d542ef6030e97031c915832..38b7f65c2539a54b9f8e8813700c53a3917baa74 100644 (file)
--- 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}');
-