[7400] parsetexi update

[gavinsmith0123]

Revision: 7400
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7400
Author:   gavin
Date:     2016-09-21 11:49:53 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-09-20 16:10:58 UTC (rev 7399)
+++ trunk/tp/parsetexi/end_line.c       2016-09-21 11:49:53 UTC (rev 7400)
@@ -2097,16 +2097,17 @@
 
           if (name) // 2811
             {
+              char *t;
               /* Set index_entry unless an empty ET_bracketed_def_content. */
-              if (name->type != ET_bracketed_def_content
-                  || name->contents.number >= 2)
-                index_entry = name;
-              else if (name->contents.number == 1)
+              if (name->type == ET_bracketed_def_content
+                  && (name->contents.number == 0
+                      || (name->contents.number == 1
+                          && (t = name->contents.list[0]->text.text)
+                          && t[strspn (t, whitespace_chars)] == '\0')))
                 {
-                  char *t = name->contents.list[0]->text.text;
-                  if (t && t[strspn (t, whitespace_chars)] != '\0')
-                    index_entry = name;
                 }
+              else
+                index_entry = name;
             }
 
           if (index_entry) // 2822