[6419] use locale from environment if it is suitable

[Gavin D. Smith]

Revision: 6419
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6419
Author:   gavin
Date:     2015-07-11 21:35:16 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
use locale from environment if it is suitable

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-11 19:43:49 UTC (rev 6418)
+++ trunk/ChangeLog     2015-07-11 21:35:16 UTC (rev 6419)
@@ -1,3 +1,8 @@
+2015-07-11  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/mylib/xspara.c (hello): Use
+       locale from environment if it is suitable.
+
 2015-07-11  Eli Zaretskii  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/mylib/xspara.c (xspara_add_text):

Modified: trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-11 19:43:49 UTC 
(rev 6418)
+++ trunk/tp/Texinfo/Convert/XSParagraph/mylib/xspara.c 2015-07-11 21:35:16 UTC 
(rev 6419)
@@ -205,7 +205,10 @@
       || len >= 5 && !memcmp (".utf8", cur + len - 5, 5)
       || len >= 6 && !memcmp (".utf-8", cur + len - 6, 6)
       || len >= 5 && !memcmp (".UTF8", cur + len - 5, 5))
-    goto success; /* In a UTF-8 locale already. */
+    {
+      setlocale (LC_CTYPE, ""); /* Use the locale from the environment. */
+      goto success;
+    }
 
   /* Otherwise try altering the current locale name. */
   dot = strchr (cur, '.');