texinfo update (Sun Nov 7 09:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.406
retrieving revision 1.407
diff -c -r1.406 -r1.407
*** ChangeLog   6 Nov 2004 22:05:59 -0000       1.406
--- ChangeLog   7 Nov 2004 13:57:22 -0000       1.407
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-11-07  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (main) [LC_MESSAGES]: #ifdef the setlocale
+       using LC_MESSAGES.  From te, 6 Nov 2004 23:36:10 +0100.
+ 
  2004-11-06  Karl Berry  <address@hidden>
  
        * lib/Makefile.am (libtxi_a_SOURCES): add strdup.h.
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** makeinfo/makeinfo.c 4 Oct 2004 13:05:49 -0000       1.67
--- makeinfo/makeinfo.c 7 Nov 2004 13:57:22 -0000       1.68
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.67 2004/10/04 13:05:49 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.68 2004/11/07 13:57:22 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 543,549 ****
--- 543,551 ----
    /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
       of the argument to @multicolumn.  */
    setlocale (LC_TIME, "");
+ #ifdef LC_MESSAGES /* ultrix */
    setlocale (LC_MESSAGES, "");
+ #endif
    setlocale (LC_CTYPE, "");
    setlocale (LC_COLLATE, "");
  #endif
P ChangeLog
P makeinfo/makeinfo.c