summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-05 18:29:48 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-05 18:29:48 +0200
commitccf623f6f8e89b687402179f292d3999de87bd3d (patch)
treedc190dca3be74b35c485a44ff9dfd71ddac1cd3d /src/eval.c
parent94f76b7fd66aaa1fcf523d79585530c6c5753514 (diff)
downloadvim-ccf623f6f8e89b687402179f292d3999de87bd3d.zip
updated for version 7.3.1309
Problem: When a script defines a function the flag to wait for the user to hit enter is reset. Solution: Restore the flag. (Yasuhiro Matsumoto) Except when the user was typing the function.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 2a2817e6d..b9d739da0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21108,6 +21108,7 @@ ex_function(eap)
int j;
int c;
int saved_did_emsg;
+ int saved_wait_return = need_wait_return;
char_u *name = NULL;
char_u *p;
char_u *arg;
@@ -21439,7 +21440,10 @@ ex_function(eap)
for (;;)
{
if (KeyTyped)
+ {
msg_scroll = TRUE;
+ saved_wait_return = FALSE;
+ }
need_wait_return = FALSE;
sourcing_lnum_off = sourcing_lnum;
@@ -21750,6 +21754,7 @@ ret_free:
vim_free(fudi.fd_newkey);
vim_free(name);
did_emsg |= saved_did_emsg;
+ need_wait_return |= saved_wait_return;
}
/*