|
 |
dcaee6 |
To: vim_dev@googlegroups.com
|
|
|
dcaee6 |
Subject: Patch 7.4.047
|
|
|
dcaee6 |
Fcc: outbox
|
|
|
dcaee6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
dcaee6 |
Mime-Version: 1.0
|
|
|
dcaee6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dcaee6 |
Content-Transfer-Encoding: 8bit
|
|
|
dcaee6 |
------------
|
|
|
dcaee6 |
|
|
|
dcaee6 |
Patch 7.4.047
|
|
|
dcaee6 |
Problem: When using input() in a function invoked by a mapping it doesn't
|
|
|
dcaee6 |
work.
|
|
|
dcaee6 |
Solution: Temporarily reset ex_normal_busy. (Yasuhiro Matsumoto)
|
|
|
dcaee6 |
Files: src/eval.c
|
|
|
dcaee6 |
|
|
|
dcaee6 |
|
|
|
dcaee6 |
*** ../vim-7.4.046/src/eval.c 2013-09-29 21:11:00.000000000 +0200
|
|
|
dcaee6 |
--- src/eval.c 2013-10-02 16:40:52.000000000 +0200
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 13054,13062 ****
|
|
|
dcaee6 |
--- 13054,13071 ----
|
|
|
dcaee6 |
}
|
|
|
dcaee6 |
|
|
|
dcaee6 |
if (defstr != NULL)
|
|
|
dcaee6 |
+ {
|
|
|
dcaee6 |
+ # ifdef FEAT_EX_EXTRA
|
|
|
dcaee6 |
+ int save_ex_normal_busy = ex_normal_busy;
|
|
|
dcaee6 |
+ ex_normal_busy = 0;
|
|
|
dcaee6 |
+ # endif
|
|
|
dcaee6 |
rettv->vval.v_string =
|
|
|
dcaee6 |
getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
|
|
|
dcaee6 |
xp_type, xp_arg);
|
|
|
dcaee6 |
+ # ifdef FEAT_EX_EXTRA
|
|
|
dcaee6 |
+ ex_normal_busy = save_ex_normal_busy;
|
|
|
dcaee6 |
+ # endif
|
|
|
dcaee6 |
+ }
|
|
|
dcaee6 |
if (inputdialog && rettv->vval.v_string == NULL
|
|
|
dcaee6 |
&& argvars[1].v_type != VAR_UNKNOWN
|
|
|
dcaee6 |
&& argvars[2].v_type != VAR_UNKNOWN)
|
|
|
dcaee6 |
*** ../vim-7.4.046/src/version.c 2013-10-02 14:25:39.000000000 +0200
|
|
|
dcaee6 |
--- src/version.c 2013-10-02 16:45:45.000000000 +0200
|
|
|
dcaee6 |
***************
|
|
|
dcaee6 |
*** 740,741 ****
|
|
|
dcaee6 |
--- 740,743 ----
|
|
|
dcaee6 |
{ /* Add new patch number below this line */
|
|
|
dcaee6 |
+ /**/
|
|
|
dcaee6 |
+ 47,
|
|
|
dcaee6 |
/**/
|
|
|
dcaee6 |
|
|
|
dcaee6 |
--
|
|
|
dcaee6 |
Not too long ago, a keyboard was something to make music with...
|
|
|
dcaee6 |
|
|
|
dcaee6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
dcaee6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
dcaee6 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
dcaee6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|