texinfo update (Fri Aug 31 20:23:01 EDT 2007)

[Karl Berry]

Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- info/info.c 1 Jul 2007 21:20:30 -0000       1.19
+++ info/info.c 1 Sep 2007 00:05:23 -0000       1.20
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.19 2007/07/01 21:20:30 karl Exp $
+   $Id: info.c,v 1.20 2007/09/01 00:05:23 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005, 2007 Free Software Foundation, Inc.
@@ -153,11 +153,20 @@
 #ifdef HAVE_SETLOCALE
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
+
   /* But don't use translated messages in the case when
      string width and length can differ */
   if (MB_CUR_MAX > 1)
-    setlocale(LC_MESSAGES, "C");
+    {
+      setenv("LANGUAGE", "C", 1);
+      setenv("LANG", "C", 1);
+#ifdef LC_MESSAGES
+      setlocale (LC_MESSAGES, "C");
 #endif
+      setenv("LC_CTYPE", "C", 1);
+      setenv("LC_ALL", "C", 1);
+    }
+#endif /* HAVE_SETLOCALE */
 
 #ifdef ENABLE_NLS
   /* Set the text message domain.  */
Index: info/man.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info/man.c  1 Jul 2007 21:20:30 -0000       1.9
+++ info/man.c  1 Sep 2007 00:05:24 -0000       1.10
@@ -1,5 +1,5 @@
 /*  man.c: How to read and format man files.
-    $Id: man.c,v 1.9 2007/07/01 21:20:30 karl Exp $
+    $Id: man.c,v 1.10 2007/09/01 00:05:24 karl Exp $
 
    Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
@@ -332,7 +332,9 @@
              multibyte characters */
           setenv("LANGUAGE", "C", 1);
           setenv("LANG", "C", 1);
+#ifdef LC_MESSAGES
           setenv("LC_MESSAGES", "C", 1);
+#endif
           setenv("LC_CTYPE", "C", 1);
           setenv("LC_ALL", "C", 1);
         }
P info/info.c
P info/man.c