1
0
forked from aniani/vim

updated for version 7.0074

This commit is contained in:
Bram Moolenaar
2005-05-20 21:31:17 +00:00
parent c930a3cc82
commit f4630b60f5
9 changed files with 57 additions and 39 deletions

View File

@@ -6234,7 +6234,7 @@ static struct fst
{"setbufvar", 3, 3, f_setbufvar},
{"setcmdpos", 1, 1, f_setcmdpos},
{"setline", 2, 2, f_setline},
{"setqflist", 1, 1, f_setqflist},
{"setqflist", 1, 2, f_setqflist},
{"setreg", 2, 3, f_setreg},
{"setwinvar", 3, 3, f_setwinvar},
{"simplify", 1, 1, f_simplify},
@@ -10601,7 +10601,7 @@ get_maparg(argvars, rettv, exact)
mode = get_map_mode(&which, 0);
keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE);
rhs = check_map(keys, mode, exact);
rhs = check_map(keys, mode, exact, FALSE);
vim_free(keys_buf);
if (rhs != NULL)
{
@@ -12370,6 +12370,9 @@ f_setqflist(argvars, rettv)
typval_T *argvars;
typval_T *rettv;
{
char_u *act;
int action = ' ';
rettv->vval.v_number = -1;
#ifdef FEAT_QUICKFIX
@@ -12379,7 +12382,14 @@ f_setqflist(argvars, rettv)
{
list_T *l = argvars[0].vval.v_list;
if (l != NULL && set_errorlist(l) == OK)
if (argvars[1].v_type == VAR_STRING)
{
act = get_tv_string(&argvars[1]);
if (*act == 'a' || *act == 'r')
action = *act;
}
if (l != NULL && set_errorlist(l, action) == OK)
rettv->vval.v_number = 0;
}
#endif

View File

@@ -5128,13 +5128,13 @@ find_help_tags(arg, num_matches, matches, keep_lang)
static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
"/*", "/\\*", "\"*", "/\\(\\)",
"?", ":?", "?<CR>", "g?", "g?g?", "g??",
"/\\?", "/\\z(\\)",
"/\\?", "/\\z(\\)", "\\=", ":s\\=",
"[count]", "[quotex]", "[range]",
"[pattern]", "\\|", "\\%$"};
static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
"/star", "/\\\\star", "quotestar", "/\\\\(\\\\)",
"?", ":?", "?<CR>", "g?", "g?g?", "g??",
"/\\\\?", "/\\\\z(\\\\)",
"/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
"\\[count]", "\\[quotex]", "\\[range]",
"\\[pattern]", "\\\\bar", "/\\\\%\\$"};
int flags;

View File

@@ -21,7 +21,7 @@ void ex_cfile __ARGS((exarg_T *eap));
void ex_vimgrep __ARGS((exarg_T *eap));
char_u *skip_vimgrep_pat __ARGS((char_u *p, char_u **s, int *flags));
int get_errorlist __ARGS((list_T *list));
int set_errorlist __ARGS((list_T *list));
int set_errorlist __ARGS((list_T *list, int action));
void ex_cbuffer __ARGS((exarg_T *eap));
void ex_helpgrep __ARGS((exarg_T *eap));
/* vim: set ft=c : */