Mercurial > vim

changeset 524:d9cc61139d12 v7.0146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0146
author vimboss
date Tue, 13 Sep 2005 21:22:27 +0000
parents a7ae7e043e43
children 1f8d8c37d6ec
files src/eval.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -6849,7 +6849,7 @@ static struct fst
     {"resolve",		1, 1, f_resolve},
     {"reverse",		1, 1, f_reverse},
     {"search",		1, 2, f_search},
-    {"searchdecl",	1, 2, f_searchdecl},
+    {"searchdecl",	1, 3, f_searchdecl},
     {"searchpair",	3, 5, f_searchpair},
     {"server2client",	2, 2, f_server2client},
     {"serverlist",	0, 0, f_serverlist},
@@ -13048,6 +13048,7 @@ f_searchdecl(argvars, rettv)
     typval_T	*rettv;
 {
     int		locally = 1;
+    int		thisblock = 0;
     int		error = FALSE;
     char_u	*name;
 
@@ -13055,10 +13056,14 @@ f_searchdecl(argvars, rettv)
 
     name = get_tv_string_chk(&argvars[0]);
     if (argvars[1].v_type != VAR_UNKNOWN)
+    {
 	locally = get_tv_number_chk(&argvars[1], &error) == 0;
+	if (!error && argvars[2].v_type != VAR_UNKNOWN)
+	    thisblock = get_tv_number_chk(&argvars[2], &error) != 0;
+    }
     if (!error && name != NULL)
 	rettv->vval.v_number = find_decl(name, (int)STRLEN(name),
-						locally, SEARCH_KEEP) == FAIL;
+				     locally, thisblock, SEARCH_KEEP) == FAIL;
 }
 
 /*