From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 13 Jul 2006 06:31:00 +0000 (+0000)
Subject: updated for version 7.0-039
X-Git-Tag: v7.0.039
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecbaf5570ae86fe25f832d6c154e1b7400dab01b;p=vim

updated for version 7.0-039
---

diff --git a/src/eval.c b/src/eval.c
index 01610fe3b..a6b2553ef 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -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);
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index bee5a3973..6c4c2fd65 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    39,
 /**/
     38,
 /**/