Merge branch 'master' into version_1_9

NotFound · Jun 9, 2012 · 3afe2cb · 3afe2cb
2 parents c193888 + 52b7b15
commit 3afe2cb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/winxedst2.winxed b/winxedst2.winxed
@@ -620,6 +620,8 @@ function getheredoc(var tk, string start, int linenum)
         switch (c) {
           case "":
             UnterminatedHeredoc(tk, linenum);
+          case "\r":
+            break; // Quick fix for windows line-ending text files
           case "\"":
           case "\\":
             // Encode the mark the same way as the heredoc content
@@ -639,6 +641,8 @@ function getheredoc(var tk, string start, int linenum)
             switch (c) {
               case "":
                 UnterminatedHeredoc(tk, linenum);
+              case "\r":
+                break; // Quick fix for windows line-ending text files
               case "\"":
               case "\\":
                 c = "\\" + c;