changeset 29517:a762488a5d08 v9.0.0100

patch 9.0.0100: get hit-enter prompt for system() when '!' is in 'guioptions' Commit: https://github.com/vim/vim/commit/cb5ed4d6252a7c76c2f85ae95cb1e4e2bccc41fc Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 28 12:54:08 2022 +0100 patch 9.0.0100: get hit-enter prompt for system() when '!' is in 'guioptions' Problem: Get hit-enter prompt for system() when '!' is in 'guioptions'. Solution: Do not call wait_return() when not redrawing. (closes https://github.com/vim/vim/issues/3327)
author Bram Moolenaar <Bram@vim.org>
date Thu, 28 Jul 2022 14:00:03 +0200
parents 877887b3a205
children b8d5460657e3
files src/os_unix.c src/version.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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,