diff options
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/os_unix.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -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; } /* diff --git a/src/os_unix.c b/src/os_unix.c index 2223faf7..37cc3a7d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -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. diff --git a/src/version.c b/src/version.c index 5a200ae8..a8d7def7 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1309, +/**/ 1308, /**/ 1307, |