X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=lexer.c;h=5f23952615ce6c1aa8d3f89607aa1c75821d7c11;hp=bb601215fb11b2e97ae7a07a9e4355eec2e9ab31;hb=d27c06ea7fb9f55ea4014851af2b219732b657ef;hpb=aa27249b880901e1c9b9cc3d5a8e8c9f918a791d

diff --git a/lexer.c b/lexer.c
index bb60121..5f23952 100644
--- 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 = '\\';