summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-l-file.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-05-02 18:39:42 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-05-02 18:39:42 +0200
commit9deb7fdf2296191efffd3324bb4d77e3d2bb224f (patch)
tree485cb5cbe730d4a7570de40c9a67b6d3dcdb575e /src/fontloader/misc/fontloader-l-file.lua
parentbdbac97964c26fa5a6a22244ed374e7f477b43d2 (diff)
downloadluaotfload-9deb7fdf2296191efffd3324bb4d77e3d2bb224f.tar.gz
[fontloader] sync with Context as of 2016-05-02
Diffstat (limited to 'src/fontloader/misc/fontloader-l-file.lua')
-rw-r--r--src/fontloader/misc/fontloader-l-file.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontloader/misc/fontloader-l-file.lua b/src/fontloader/misc/fontloader-l-file.lua
index 7ed6370..b6822e9 100644
--- a/src/fontloader/misc/fontloader-l-file.lua
+++ b/src/fontloader/misc/fontloader-l-file.lua
@@ -436,7 +436,7 @@ local deslasher = lpeg.replacer(S("\\/")^1,"/")
function file.join(one, two, three, ...)
if not two then
- return one == "" and one or lpegmatch(stripper,one)
+ return one == "" and one or lpegmatch(reslasher,one)
end
if one == "" then
return lpegmatch(stripper,three and concat({ two, three, ... },"/") or two)