texinfo update (Thu Jul 12 09:53:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -r1.730 -r1.731
--- ChangeLog   11 Jul 2007 00:16:23 -0000      1.730
+++ ChangeLog   12 Jul 2007 13:28:11 -0000      1.731
@@ -1,3 +1,8 @@
+2007-07-12  Karl Berry  <address@hidden>
+
+       * makeinfo/lang.c (default_country_for_lang): strcasecmp returns 0
+       when we find en.
+
 2007-07-10  Karl Berry  <address@hidden>
 
        * makeinfo/makeinfo.h (enable_encoding): default to 1.
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- makeinfo/lang.c     11 Jul 2007 00:16:23 -0000      1.28
+++ makeinfo/lang.c     12 Jul 2007 13:28:11 -0000      1.29
@@ -1,5 +1,5 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.28 2007/07/11 00:16:23 karl Exp $
+   $Id: lang.c,v 1.29 2007/07/12 13:28:11 karl Exp $
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -724,7 +724,8 @@
    new memory).  We use the same table as gettext, and return LL_CODE
    uppercased in the absence of any better possibility, with a warning.
    (gettext silently defaults to the C locale, but we want to give users
-   a shot at fixing ambiguities.)  */
+   a shot at fixing ambiguities.)  We also return en_US for en, while
+   gettext does not.  */
 
 #define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
 
@@ -946,10 +947,10 @@
         }
     }
   
-  /* If didn't find one to copy, warn and duplicate.  */
+  /* If we didn't find one to copy, warn and duplicate.  */
   if (c == principal_len)
     {
-      if (strcasecmp (ll_code, "en"))
+      if (strcasecmp (ll_code, "en") == 0)
         cc_code = xstrdup ("en_US");
       else
         {
P ChangeLog
P makeinfo/lang.c