Mercurial > vim

comparison src/eval.c @ 3689:acd91c9741a6 v7.3.604

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.604 Problem: inputdialog() doesn't use the cancel argument in the console. (David Fishburn) Solution: Use the third argument. (Christian Brabant)
author Bram Moolenaar <bram@vim.org>
date Mon, 16 Jul 2012 19:27:29 +0200
parents 085f14642fe8
children d47e6222d1cd
comparison
equal deleted inserted replaced
3688:e92f6b13cb3d 3689:acd91c9741a6
12938 { 12938 {
12939 char_u *xp_name; 12939 char_u *xp_name;
12940 int xp_namelen; 12940 int xp_namelen;
12941 long argt; 12941 long argt;
12942 12942
12943 /* input() with a third argument: completion */
12943 rettv->vval.v_string = NULL; 12944 rettv->vval.v_string = NULL;
12944 12945
12945 xp_name = get_tv_string_buf_chk(&argvars[2], buf); 12946 xp_name = get_tv_string_buf_chk(&argvars[2], buf);
12946 if (xp_name == NULL) 12947 if (xp_name == NULL)
12947 return; 12948 return;
12956 12957
12957 if (defstr != NULL) 12958 if (defstr != NULL)
12958 rettv->vval.v_string = 12959 rettv->vval.v_string =
12959 getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr, 12960 getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
12960 xp_type, xp_arg); 12961 xp_type, xp_arg);
12962 if (rettv->vval.v_string == NULL
12963 && argvars[1].v_type != VAR_UNKNOWN
12964 && argvars[2].v_type != VAR_UNKNOWN)
12965 rettv->vval.v_string = vim_strsave(get_tv_string_buf(
12966 &argvars[2], buf));
12961 12967
12962 vim_free(xp_arg); 12968 vim_free(xp_arg);
12963 12969
12964 /* since the user typed this, no need to wait for return */ 12970 /* since the user typed this, no need to wait for return */
12965 need_wait_return = FALSE; 12971 need_wait_return = FALSE;