[7393] parsetexi update

[gavinsmith0123]

Revision: 7393
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7393
Author:   gavin
Date:     2016-09-19 19:43:53 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-09-19 18:31:31 UTC (rev 7392)
+++ trunk/tp/parsetexi/end_line.c       2016-09-19 19:43:53 UTC (rev 7393)
@@ -1333,11 +1333,6 @@
           trimmed = trim_spaces_comment_from_content
             (args_child_by_index(current, 0));
 
-          if (trimmed->contents.number > 1
-              || (trimmed->contents.number == 1
-                  && !trimmed->contents.list[0]->text.text))
-            superfluous_arg = 1;
-
           text = convert_to_text (trimmed, &superfluous_arg);
         }
 

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-09-19 18:31:31 UTC (rev 7392)
+++ trunk/tp/parsetexi/parser.c 2016-09-19 19:43:53 UTC (rev 7393)
@@ -1277,8 +1277,8 @@
                   && cmd != CM_verbatiminclude
                   && cmd != CM_set
                   && cmd != CM_clear
-                  && cmd != CM_vskip)
-              || (command_data(cmd).flags & CF_in_heading)))
+                  && cmd != CM_vskip
+                  && !(command_data(cmd).flags & CF_in_heading))))
         {
           line_warn ("@%s should only appear at the beginning of a line", 
                      command_name(cmd));