'string.find' as it was in 5.0

2 files changed, 2 insertions, 15 deletions

diff --git a/lstrlib.c b/lstrlib.c
index 081de1c7..faf0f0f4 100644
--- a/lstrlib.c
+++ b/lstrlib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lstrlib.c,v 1.122 2005/08/15 14:12:32 roberto Exp roberto $
+** $Id: lstrlib.c,v 1.123 2005/08/26 17:36:32 roberto Exp roberto $
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
@@ -516,12 +516,7 @@ static int str_find_aux (lua_State *L, int find) {
         if (find) {
           lua_pushinteger(L, s1-s+1);  /* start */
           lua_pushinteger(L, res-s);   /* end */
-#if defined(LUA_COMPAT_FIND)
           return push_captures(&ms, NULL, 0) + 2;
-#else
-          return 2;
-#endif
-
         }
         else
           return push_captures(&ms, s1, res);
diff --git a/luaconf.h b/luaconf.h
index 62ca2c8f..c4bd3d51 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.66 2005/09/14 17:23:03 roberto Exp roberto $
+** $Id: luaconf.h,v 1.67 2005/09/14 17:44:48 roberto Exp roberto $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -316,20 +316,12 @@
 #define LUA_COMPAT_LSTR         1
 
 /*
-@@ LUA_COMPAT_FIND controls compatibility with old 'string.find' behavior.
-** CHANGE it to undefined as soon as your programs use 'string.find' only
-** to find patterns.
-*/
-#define LUA_COMPAT_FIND
-
-/*
 @@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
 ** CHANGE it to undefined as soon as you rename 'string.gfind' to
 ** 'string.gmatch'.
 */
 #define LUA_COMPAT_GFIND
 
-
 /*
 @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
 @* behavior.