1
0
forked from aniani/vim

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.
This commit is contained in:
Bram Moolenaar 2013-07-05 18:29:48 +02:00
parent 94f76b7fd6
commit ccf623f6f8
3 changed files with 7 additions and 1 deletions

View File

@ -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;
}
/*

View File

@ -6129,7 +6129,6 @@ save_patterns(num_pat, pat, num_file, file)
}
#endif
/*
* Return TRUE if the string "p" contains a wildcard that mch_expandpath() can
* expand.

View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1309,
/**/
1308,
/**/