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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 100, /**/ 99, /**/