updated for version 7.4.047

Problem:    When using input() in a function invoked by a mapping it doesn't
            work.
Solution:   Temporarily reset ex_normal_busy. (Yasuhiro Matsumoto)

diff --git a/src/eval.c b/src/eval.c
index 68f80fc7dbac92fdfc3c12cb76bd1ed35d65f5a1..c3ac4673db3e7e5f86a8a13589385fc9102489b6 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -13054,9 +13054,18 @@ get_user_input(argvars, rettv, inputdialog)
        }
 
        if (defstr != NULL)
+       {
+# ifdef FEAT_EX_EXTRA
+           int save_ex_normal_busy = ex_normal_busy;
+           ex_normal_busy = 0;
+# endif
            rettv->vval.v_string =
                getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
                                  xp_type, xp_arg);
+# ifdef FEAT_EX_EXTRA
+           ex_normal_busy = save_ex_normal_busy;
+# endif
+       }
        if (inputdialog && rettv->vval.v_string == NULL
                && argvars[1].v_type != VAR_UNKNOWN
                && argvars[2].v_type != VAR_UNKNOWN)

diff --git a/src/version.c b/src/version.c
index c43ae93f080e309bc2bd5f418ace47ee67be84c8..6b543975e0990116722dbc601b9c0726f83aad63 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    47,
 /**/
     46,
 /**/