Skip to content
Browse files

Merge branch 'master' into version_1_9

  • Loading branch information...
2 parents c193888 + 52b7b15 commit 3afe2cb86bbe25d405981b9c3ec60c718c10438d @NotFound committed Jun 9, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 winxedst2.winxed
View
4 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;

0 comments on commit 3afe2cb

Please sign in to comment.
Something went wrong with that request. Please try again.