[7177] parsetexi update

[gavinsmith0123]

Revision: 7177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7177
Author:   gavin
Date:     2016-05-22 18:09:41 +0000 (Sun, 22 May 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/close.c

Modified: trunk/tp/parsetexi/close.c
===================================================================
--- trunk/tp/parsetexi/close.c  2016-05-22 17:42:15 UTC (rev 7176)
+++ trunk/tp/parsetexi/close.c  2016-05-22 18:09:41 UTC (rev 7177)
@@ -263,6 +263,8 @@
         }
       else if (command_flags(current) & CF_block)
         {
+          enum command_id cmd = current->cmd;
+          ELEMENT *parent = 0;
           if (closed_command)
             {
               line_error ("address@hidden' expected `%s', but saw `%s'",
@@ -282,16 +284,21 @@
 
               /* Ignored conditional. */
               if (command_data(current->cmd).data == BLOCK_conditional)
-                destroy_element (pop_element_from_contents (current->parent));
+                {
+                  parent = current->parent;
+                  destroy_element (pop_element_from_contents (parent));
+                }
               /* FIXME: Why not avoid adding the element
                  in the first place? */
             }
-          if (command_flags(current)
+          if (command_data(cmd).flags
               & (CF_preformatted | CF_menu | CF_format_raw))
             {
               pop_context ();
             }
-          current = current->parent;
+          if (!parent)
+            parent = current->parent;
+          current = parent;
         }
       else
         {