patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exe
Problem: A lot of code is shared between vim.exe and gvim.exe.
Solution: Optionally put the shared code in vim.dll. (Ken Takata,
closes #4287)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 0ab5df6..8766c66 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1537,7 +1537,7 @@
int flags) /* may be SHELL_DOOUT when output is redirected */
{
buf_T *buf;
-#ifndef FEAT_GUI_MSWIN
+#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
int save_nwr;
#endif
#ifdef MSWIN
@@ -1636,32 +1636,37 @@
* Otherwise there is probably text on the screen that the user wants
* to read before redrawing, so call wait_return().
*/
-#ifndef FEAT_GUI_MSWIN
- if (cmd == NULL
+#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
+# ifdef VIMDLL
+ if (!gui.in_use)
+# endif
+ {
+ if (cmd == NULL
# ifdef MSWIN
- || (keep_termcap && !need_wait_return)
+ || (keep_termcap && !need_wait_return)
# endif
- )
- {
- if (msg_silent == 0)
- redraw_later_clear();
- need_wait_return = FALSE;
- }
- else
- {
- /*
- * If we switch screens when starttermcap() is called, we really
- * want to wait for "hit return to continue".
- */
- save_nwr = no_wait_return;
- if (swapping_screen())
- no_wait_return = FALSE;
+ )
+ {
+ if (msg_silent == 0)
+ redraw_later_clear();
+ need_wait_return = FALSE;
+ }
+ else
+ {
+ /*
+ * If we switch screens when starttermcap() is called, we
+ * really want to wait for "hit return to continue".
+ */
+ save_nwr = no_wait_return;
+ if (swapping_screen())
+ no_wait_return = FALSE;
# ifdef AMIGA
- wait_return(term_console ? -1 : msg_silent == 0); /* see below */
+ wait_return(term_console ? -1 : msg_silent == 0); // see below
# else
- wait_return(msg_silent == 0);
+ wait_return(msg_silent == 0);
# endif
- no_wait_return = save_nwr;
+ no_wait_return = save_nwr;
+ }
}
#endif /* FEAT_GUI_MSWIN */