summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-11-24 12:35:21 +0100
committerBram Moolenaar <Bram@vim.org>2010-11-24 12:35:21 +0100
commit96e5ceed93ea55cf80f76f51407ba840cf7a820d (patch)
tree9e0f7b1268db05c5a413b68f050d851bef9a8427
parent166af9bb6f4f0c9a2f570766d26b42d2041860f2 (diff)
downloadvim-git-96e5ceed93ea55cf80f76f51407ba840cf7a820d.tar.gz
updated for version 7.3.063v7.3.063
Problem: Win32: Running a filter command makes Vim lose focus. Solution: Use SW_SHOWMINNOACTIVE instead of SW_SHOWMINIMIZED. (Hong Xu)
-rw-r--r--src/os_win32.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 423ea8903..0dd7a8286 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3185,9 +3185,10 @@ mch_system(char *cmd, int options)
* It's nicer to run a filter command in a minimized window, but in
* Windows 95 this makes the command MUCH slower. We can't do it under
* Win32s either as it stops the synchronous spawn workaround working.
+ * Don't activate the window to keep focus on Vim.
*/
if ((options & SHELL_DOOUT) && !mch_windows95() && !gui_is_win32s())
- si.wShowWindow = SW_SHOWMINIMIZED;
+ si.wShowWindow = SW_SHOWMINNOACTIVE;
else
si.wShowWindow = SW_SHOWNORMAL;
si.cbReserved2 = 0;
diff --git a/src/version.c b/src/version.c
index da022457b..37c5af2de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 63,
+/**/
62,
/**/
61,