From 1f05308a7f1730ffe1bb51872f5c7aef0a65b3eb Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sun, 12 May 2013 22:09:30 +0200
Subject: sync with Context as of 2013-05-12

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

diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index 008b02a..0cc61b4 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/10/13 15:05:28
+-- merge date  : 05/12/13 14:50:50
 
 do -- begin closure to overcome local limits and interference
 
@@ -4650,7 +4650,7 @@ local function fromunicode16(str)
     return tonumber(str,16)
   else
     local l,r=match(str,"(....)(....)")
-    return (tonumber(l,16)- 0xD800)*0x400+tonumber(r,16)-0xDC00
+    return (tonumber(l,16))*0x400+tonumber(r,16)-0xDC00
   end
 end
 mappings.loadlumtable=loadlumtable
-- 
cgit v1.2.3