summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-util-str.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-05-26 08:13:25 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-05-26 08:13:25 +0200
commit7bad2f7429de8354f0105108ea495c0c6b85291b (patch)
tree9591284b4b1cecf40be12292ccc901743a1a57f9 /src/fontloader/misc/fontloader-util-str.lua
parent0a03da95e41ed2e4e1082ebde9f20461aa6b1842 (diff)
downloadluaotfload-7bad2f7429de8354f0105108ea495c0c6b85291b.tar.gz
[fontloader] sync with Context as of 2015-05-26
Diffstat (limited to 'src/fontloader/misc/fontloader-util-str.lua')
-rw-r--r--src/fontloader/misc/fontloader-util-str.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontloader/misc/fontloader-util-str.lua b/src/fontloader/misc/fontloader-util-str.lua
index de4a87e..c2139b1 100644
--- a/src/fontloader/misc/fontloader-util-str.lua
+++ b/src/fontloader/misc/fontloader-util-str.lua
@@ -1118,7 +1118,7 @@ function string.optionalquoted(str)
return lpegmatch(pattern,str) or str
end
-local pattern = Cs((newline / os.newline + 1)^0)
+local pattern = Cs((newline / (os.newline or "\r") + 1)^0)
function string.replacenewlines(str)
return lpegmatch(pattern,str)