Docs: options after "run" of ${run } may not have space. Bug 2932

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 8055daebeb5f9c0b170649f3edb8f427655fe29b..86f8dda630ae8cc444c46777ea86236d1310a9d1 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -10587,12 +10587,13 @@ expansion items.
 This item inserts &"raw"& header lines. It is described with the &%header%&
 expansion item in section &<<SECTexpansionitems>>& above.
 
 This item inserts &"raw"& header lines. It is described with the &%header%&
 expansion item in section &<<SECTexpansionitems>>& above.
 

-.vitem "&*${run <&'options'&> {*&<&'command&~arg&~list'&>&*}{*&<&'string1'&>&*}&&&
+.vitem "&*${run<&'options'&> {*&<&'command&~arg&~list'&>&*}{*&<&'string1'&>&*}&&&

         {*&<&'string2'&>&*}}*&"
 .cindex "expansion" "running a command"
 .cindex "&%run%& expansion item"
 This item runs an external command, as a subprocess.
         {*&<&'string2'&>&*}}*&"
 .cindex "expansion" "running a command"
 .cindex "&%run%& expansion item"
 This item runs an external command, as a subprocess.

-One option is supported after the word &'run'&, comma-separated.
+One option is supported after the word &'run'&, comma-separated
+and without whitespace.

 
 If the option &'preexpand'& is not used,
 the command string is split into individual arguments by spaces
 
 If the option &'preexpand'& is not used,
 the command string is split into individual arguments by spaces

diff --git a/src/src/expand.c b/src/src/expand.c
index 6dcd450628d8d7c9599b224642af70551bb52a3d..9f80439cbae87b0db0cebcd626885b7f074e9122 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -5630,7 +5630,6 @@ while (*s)
       /* Handle options to the "run" */
 
       while (*s == ',')
       /* Handle options to the "run" */
 
       while (*s == ',')

-       {

        if (Ustrncmp(++s, "preexpand", 9) == 0)
          { late_expand = FALSE; s += 9; }
        else
        if (Ustrncmp(++s, "preexpand", 9) == 0)
          { late_expand = FALSE; s += 9; }
        else


@@ -5641,7 +5640,6 @@ while (*s)
                                                  (int)(t-s), s);
          goto EXPAND_FAILED;
          }
                                                  (int)(t-s), s);
          goto EXPAND_FAILED;
          }

-       }

       Uskip_whitespace(&s);
 
       if (*s != '{')                                   /*}*/
       Uskip_whitespace(&s);
 
       if (*s != '{')                                   /*}*/