Merge branch 'master' into cooking

This commit is contained in:
Wolfgang Bumiller 2013-02-20 23:08:58 +01:00
commit d27c06ea7f

View file

@ -992,6 +992,8 @@ int lex_do(lex_file *lex)
if (!lex->flags.mergelines || ch != '\\')
break;
ch = lex_getch(lex);
if (ch == '\r')
ch = lex_getch(lex);
if (ch != '\n') {
lex_ungetch(lex, ch);
ch = '\\';