thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0-039

Browse Source
This commit is contained in:
Bram Moolenaar
2006-07-13 06:31:00 +00:00
parent ce6ef25cef
commit ecbaf5570a
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/eval.c
View File

@@ -11321,14 +11321,19 @@ f_index(argvars, rettv)
static int inputsecret_flag = 0;
static void get_user_input __ARGS((typval_T *argvars, typval_T *rettv, int inputdialog));
/*
* "input()" function
* Also handles inputsecret() when inputsecret is set.
* This function is used by f_input() and f_inputdialog() functions. The third
* argument to f_input() specifies the type of completion to use at the
* prompt. The third argument to f_inputdialog() specifies the value to return
* when the user cancels the prompt.
*/
static void
f_input(argvars, rettv)
get_user_input(argvars, rettv, inputdialog)
typval_T *argvars;
typval_T *rettv;
int inputdialog;
{
char_u *prompt = get_tv_string_chk(&argvars[0]);
char_u *p = NULL;
@@ -11378,7 +11383,7 @@ f_input(argvars, rettv)
if (defstr != NULL)
stuffReadbuffSpec(defstr);
if (argvars[2].v_type != VAR_UNKNOWN)
if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN)
{
char_u *xp_name;
int xp_namelen;
@@ -11412,6 +11417,18 @@ f_input(argvars, rettv)
cmd_silent = cmd_silent_save;
}
/*
* "input()" function
* Also handles inputsecret() when inputsecret is set.
*/
static void
f_input(argvars, rettv)
typval_T *argvars;
typval_T *rettv;
{
get_user_input(argvars, rettv, FALSE);
}
/*
* "inputdialog()" function
*/
@@ -11452,7 +11469,7 @@ f_inputdialog(argvars, rettv)
}
else
#endif
f_input(argvars, rettv);
get_user_input(argvars, rettv, TRUE);
}
/*