aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-12-01 12:01:20 +0000
committerThomas Adam <thomas@xteddy.org>2020-12-01 12:01:20 +0000
commit4724702d4eef9e9d7c1bfa39e85b8aeed37a0d12 (patch)
tree3f65ce358e98ce306c6a2e840a45effc7e8ae46c
parent27634645e953baf046e1b74139deba7cbdde1ca2 (diff)
parentf0c1233d4f97b499dd51688b089ad7c485c14b2a (diff)
downloadrtmux-4724702d4eef9e9d7c1bfa39e85b8aeed37a0d12.tar.gz
rtmux-4724702d4eef9e9d7c1bfa39e85b8aeed37a0d12.tar.bz2
rtmux-4724702d4eef9e9d7c1bfa39e85b8aeed37a0d12.zip
Merge branch 'obsd-master' into master
-rw-r--r--cmd-parse.y6
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 != '#')