Pleas apply it for 7.2.1 and current CVS.

Patch fixes using lc.lang instead of lc.lc_ctype.

Teodor Sigaev

diff --git a/contrib/tsearch/morph.c b/contrib/tsearch/morph.c
index 9eaefabfafcd279a9b27ca406ac59707059d92c3..60797b07e92441c7f218c16d775e22e658a249ed 100644 (file)
--- a/contrib/tsearch/morph.c
+++ b/contrib/tsearch/morph.c
@@ -114,12 +114,13 @@ initmorph(void)
 
 #ifdef USE_LOCALE
        PGLC_current(&lc);
-       for (i = 1; i < lengthof(dicts); i++)
-               if (strcmp(dicts[i].localename, lc.lang) == 0)
-               {
-                       bylocaledict = i;
-                       break;
-               }
+       if ( lc.lc_ctype )
+               for (i = 1; i < lengthof(dicts); i++)
+                       if (strcmp(dicts[i].localename, lc.lc_ctype) == 0)
+                       {
+                               bylocaledict = i;
+                               break;
+                       }
        PGLC_free_categories(&lc);
 #endif