From 4b259fe1b191794764a97949c1bc31c01fa2816d Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Wed, 15 May 2013 10:41:13 +0200
Subject: sync with Context as of 2013-05-15

---
 luaotfload-merged.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index f814bdb..14667bd 100644
--- a/luaotfload-merged.lua
+++ b/luaotfload-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/12/13 22:16:22
+-- merge date  : 05/14/13 23:14:52
 
 do -- begin closure to overcome local limits and interference
 
@@ -2046,7 +2046,11 @@ function file.splitname(str,splitdrive)
   end
 end
 function file.splitbase(str)
-  return str and lpegmatch(pattern_d,str) 
+  if str then
+    return lpegmatch(pattern_d,str) 
+  else
+    return "",str 
+  end
 end
 function file.nametotable(str,splitdrive)
   if str then
-- 
cgit v1.2.3