Merge branch 'master' into cooking

diff --git a/lexer.c b/lexer.c
index bb601215fb11b2e97ae7a07a9e4355eec2e9ab31..5f23952615ce6c1aa8d3f89607aa1c75821d7c11 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -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 = '\\';