texinfo update (Thu Apr 13 18:22:01 EDT 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- ChangeLog   11 Apr 2006 17:22:54 -0000      1.584
+++ ChangeLog   13 Apr 2006 21:57:09 -0000      1.585
@@ -1,3 +1,8 @@
+2006-04-13  Karl Berry  <address@hidden>
+
+       * makeinfo/insertion.c (end_insertion): kill_self_indent(-1) to
+       remove all indentation.  From Brian Gough, 11 Apr 2006 16:42:29 +0100.
+
 2006-04-11  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (GNU Sample Texts): GFDL is version 1.2 now.
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- makeinfo/insertion.c        15 Aug 2005 13:05:24 -0000      1.60
+++ makeinfo/insertion.c        13 Apr 2006 21:57:09 -0000      1.61
@@ -1,8 +1,8 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.60 2005/08/15 13:05:24 karl Exp $
+   $Id: insertion.c,v 1.61 2006/04/13 21:57:09 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1226,8 +1226,10 @@
              does not function here, since we've inserted non-whitespace
              (the </whatever>) before it.  The indentation already got
              inserted at the end of the last example line, so we have to
-             delete it, or browsers wind up showing an extra blank line.  */
-          kill_self_indent (default_indentation_increment);
+             delete it, or browsers wind up showing an extra blank line.
+             Furthermore, if we're inside indented environments, we
+             might have arbitrarily much indentation, so remove it all.  */
+          kill_self_indent (-1);
           add_html_block_elt (type == quotation
               ? "</blockquote>\n" : "</pre>\n");
         }
P ChangeLog
P makeinfo/insertion.c