Fix merge

splhack · splhack · commit 739bff384e39 · 2015-02-11T11:43:23.000-08:00
diff --git a/src/if_lua.c b/src/if_lua.c
@@ -1920,8 +1920,8 @@ void do_luaeval(char_u *str, typval_T *arg, typval_T *rettv)
 int set_ref_in_lua(int copyID)
 {
     switch (dynamic_lua_version) {
-    case DYNAMIC_LUA_VER51: return set_ref_in_lua51(copyID); return;
-    case DYNAMIC_LUA_VER52: return set_ref_in_lua52(copyID); return;
+    case DYNAMIC_LUA_VER51: return set_ref_in_lua51(copyID);
+    case DYNAMIC_LUA_VER52: return set_ref_in_lua52(copyID);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1920,8 +1920,8 @@ void do_luaeval(char_u str, typval_T arg, typval_T *rettv)`
`1920`	`1920`	`int set_ref_in_lua(int copyID)`
`1921`	`1921`	`{`
`1922`	`1922`	`switch (dynamic_lua_version) {`
`1923`		`- case DYNAMIC_LUA_VER51: return set_ref_in_lua51(copyID); return;`
`1924`		`- case DYNAMIC_LUA_VER52: return set_ref_in_lua52(copyID); return;`
	`1923`	`+ case DYNAMIC_LUA_VER51: return set_ref_in_lua51(copyID);`
	`1924`	`+ case DYNAMIC_LUA_VER52: return set_ref_in_lua52(copyID);`
`1925`	`1925`	`}`
`1926`	`1926`	`}`
`1927`	`1927`