Fix merge

Author: splhack

src/if_lua.c

@@ -1917,11 +1917,11 @@ void do_luaeval(char_u *str, typval_T *arg, typval_T *rettv)
     }
 }
 
-void set_ref_in_lua(int copyID)
+int set_ref_in_lua(int copyID)
 {
     switch (dynamic_lua_version) {
-    case DYNAMIC_LUA_VER51: set_ref_in_lua51(copyID); return;
-    case DYNAMIC_LUA_VER52: set_ref_in_lua52(copyID); return;
+    case DYNAMIC_LUA_VER51: return set_ref_in_lua51(copyID); return;
+    case DYNAMIC_LUA_VER52: return set_ref_in_lua52(copyID); return;
     }
 }
 

src/proto/if_lua52.pro

@@ -7,5 +7,5 @@ void ex_lua52file __ARGS((exarg_T *eap));
 void lua52_buffer_free __ARGS((buf_T *buf));
 void lua52_window_free __ARGS((win_T *win));
 void do_lua52eval __ARGS((char_u *str, typval_T *arg, typval_T *rettv));
-void set_ref_in_lua52 __ARGS((int copyID));
+int set_ref_in_lua52 __ARGS((int copyID));
 /* vim: set ft=c : */