Skip to content
Browse files

Merge branch 'master' into version_1_9

  • Loading branch information...
2 parents 3387865 + 4cdcb56 commit b08e12de68df934cb8c67ae5690a8758be37af74 @NotFound committed Jun 9, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 winxedst2.winxed
View
10 winxedst2.winxed
@@ -626,10 +626,11 @@ function getheredoc(var tk, string start, int linenum)
case "\\":
// Encode the mark the same way as the heredoc content
// to simplify its detection
- c = "\\" + c;
+ mark += "\\" + c;
break;
+ default:
+ mark += c;
}
- mark = mark + c;
}
mark = mark + ":>>";
@@ -645,10 +646,11 @@ function getheredoc(var tk, string start, int linenum)
break; // Quick fix for windows line-ending text files
case "\"":
case "\\":
- c = "\\" + c;
+ line += "\\" + c;
break;
+ default:
+ line += c;
}
- line += c;
}
if (line != mark)
content += line + "\\n";

0 comments on commit b08e12d

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