commit afde13b62b8fa25dac4635d5caee8d088b937ee0
author Bram Moolenaar <Bram@vim.org> Sun Apr 28 19:46:49 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Apr 28 19:46:49 2019 +0200
tree 6a8b58aa58e180e55b2948e5d0bfdbc3d4692a49
parent ab4cece6053b0bfd604e15065227b94af873608b

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)

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 7444697..bf0d7f7 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7756,7 +7756,10 @@
     if (*arg == NUL)
     {
 # if defined(FEAT_GUI) || defined(MSWIN)
-#  ifdef FEAT_GUI
+#  ifdef VIMDLL
+	if (gui.in_use ? gui_mch_get_winpos(&x, &y) != FAIL :
+		mch_get_winpos(&x, &y) != FAIL)
+#  elif defined(FEAT_GUI)
 	if (gui.in_use && gui_mch_get_winpos(&x, &y) != FAIL)
 #  else
 	if (mch_get_winpos(&x, &y) != FAIL)
@@ -7789,13 +7792,12 @@
 	    gui_win_x = x;
 	    gui_win_y = y;
 	}
-#  ifdef HAVE_TGETENT
+#  if defined(HAVE_TGETENT) || defined(VIMDLL)
 	else
 #  endif
-# else
-#  ifdef MSWIN
+# endif
+# if defined(MSWIN) && (!defined(FEAT_GUI) || defined(VIMDLL))
 	    mch_set_winpos(x, y);
-#  endif
 # endif
 # ifdef HAVE_TGETENT
 	if (*T_CWP)
@@ -8239,8 +8241,11 @@
     if (need_maketitle)
 	maketitle();
 #endif
-#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
-    resize_console_buf();
+#if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(VIMDLL))
+# ifdef VIMDLL
+    if (!gui.in_use)
+# endif
+	resize_console_buf();
 #endif
     RedrawingDisabled = r;
     p_lz = p;