summaryrefslogtreecommitdiff
path: root/lualibs-file.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-08-15 22:39:47 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-08-15 22:39:47 +0200
commit8ee68eedb5cbdf06585f6f37bdc361b69437a25d (patch)
tree228c85b38d015ec6237976808ea82b8616b22e21 /lualibs-file.lua
parent935306412b57f436fcb5307a14941ded3eb3168d (diff)
downloadlualibs-8ee68eedb5cbdf06585f6f37bdc361b69437a25d.tar.gz
sync with Cotnext as of 2016-08-15
Diffstat (limited to 'lualibs-file.lua')
-rw-r--r--lualibs-file.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/lualibs-file.lua b/lualibs-file.lua
index 7ed6370..b6822e9 100644
--- a/lualibs-file.lua
+++ b/lualibs-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)