diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-05 18:29:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-05 18:29:48 +0200 |
| commit | ccf623f6f8e89b687402179f292d3999de87bd3d (patch) | |
| tree | dc190dca3be74b35c485a44ff9dfd71ddac1cd3d | |
| parent | 94f76b7fd66aaa1fcf523d79585530c6c5753514 (diff) | |
updated for version 7.3.1309v7.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.
| -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
diff --git a/src/eval.c b/src/eval.c index 2a2817e6d2..b9d739da01 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; } /* diff --git a/src/os_unix.c b/src/os_unix.c index 2223faf77d..37cc3a7dd2 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 5a200ae8fb..a8d7def798 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, |