diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-07-28 12:54:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-28 12:54:08 +0100 |
| commit | cb5ed4d6252a7c76c2f85ae95cb1e4e2bccc41fc (patch) | |
| tree | 9425c898abba354db03f6bac3a25aa1243b48ab6 /src | |
| parent | 46af7bc08debbf408d025680eeef136fb3b528ef (diff) | |
patch 9.0.0100: get hit-enter prompt for system() when '!' is in 'guioptions'v9.0.0100
Problem: Get hit-enter prompt for system() when '!' is in 'guioptions'.
Solution: Do not call wait_return() when not redrawing. (closes #3327)
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 18c766d246..07762f4c11 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4522,7 +4522,10 @@ mch_call_shell_terminal( // restore curwin/curbuf and a few other things aucmd_restbuf(&aco); - wait_return(TRUE); + // only require pressing Enter when redrawing, to avoid that system() gets + // the hit-enter prompt even though it didn't output anything. + if (!RedrawingDisabled) + wait_return(TRUE); do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD, buf->b_fnum, TRUE); theend: diff --git a/src/version.c b/src/version.c index c0a0315a9a..9e682a5fd6 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 100, +/**/ 99, /**/ 98, |