diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /cmd-parse.y | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'cmd-parse.y')
| -rw-r--r-- | cmd-parse.y | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd-parse.y b/cmd-parse.y index c8995d8b..7b42c621 100644 --- a/cmd-parse.y +++ b/cmd-parse.y @@ -1505,8 +1505,12 @@ yylex_token(int ch) state == NONE) break; - /* Spaces and comments inside quotes after \n are removed. */ + /* + * Spaces and comments inside quotes after \n are removed but + * the \n is left. + */ if (ch == '\n' && state != NONE) { + yylex_append1(&buf, &len, '\n'); while ((ch = yylex_getc()) == ' ' || ch == '\t') /* nothing */; if (ch != '#') |