Merge branch 'obsd-master' into master

2020-12-01 12:01:20 +00:00 · 2020-12-01 12:01:20 +00:00 · 4724702d4e
parent 27634645e9 f0c1233d4f
commit 4724702d4e
1 changed files with 5 additions and 1 deletions
--- 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 != '#')