diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2016-08-15 23:18:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-15 23:18:33 +0200 |
| commit | 144f6d16fd79bd0496b3ae379b69227e0d9bbfa9 (patch) | |
| tree | 228c85b38d015ec6237976808ea82b8616b22e21 /lualibs-file.lua | |
| parent | f3495d7db72f854d8f7560a6ff11fa9012003062 (diff) | |
| parent | 8ee68eedb5cbdf06585f6f37bdc361b69437a25d (diff) | |
| download | lualibs-144f6d16fd79bd0496b3ae379b69227e0d9bbfa9.tar.gz | |
Merge pull request #30 from phi-gamma/master
sync with Context as of 2016-08-15
Diffstat (limited to 'lualibs-file.lua')
| -rw-r--r-- | lualibs-file.lua | 2 |
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) |