texinfo update (Fri Feb 15 13:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- ChangeLog   11 Feb 2008 16:47:12 -0000      1.815
+++ ChangeLog   15 Feb 2008 17:53:25 -0000      1.816
@@ -1,3 +1,9 @@
+2008-02-15  Karl Berry  <address@hidden>
+
+       * makeinfo/cmds.c (handle_include): set in_fixed_width_font
+       for expanding the filename argument, so -- doesn't become -.
+       Bug report from Daniel Richard G., 13 Feb 2008 01:50:00.
+
 2008-02-11  Karl Berry  <address@hidden>
 
        * info/session.c (incremental_search): if a regex search,
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- makeinfo/cmds.c     31 Jan 2008 18:33:27 -0000      1.79
+++ makeinfo/cmds.c     15 Feb 2008 17:53:25 -0000      1.80
@@ -1,5 +1,5 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.79 2008/01/31 18:33:27 karl Exp $
+   $Id: cmds.c,v 1.80 2008/02/15 17:53:25 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    2007, 2008 Free Software Foundation, Inc.
@@ -1895,7 +1895,13 @@
   get_rest_of_line (0, &arg);
   /* We really only want to expand @value, but it's easier to just do
      everything.  TeX will only work with @value.  */
-  filename = text_expansion (arg);
+  {
+    int save_in_fixed_width_font = in_fixed_width_font;
+    in_fixed_width_font = 1;  /* do not change -- to -, etc.  */
+    filename = text_expansion (arg);
+    in_fixed_width_font = save_in_fixed_width_font;    
+  }
+
   free (arg);
   
   if (macro_expansion_output_stream && !executing_string)
P ChangeLog
P makeinfo/cmds.c