From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 10 Mar 2010 11:25:03 +0000 (+0100)
Subject: updated for version 7.2.386
X-Git-Tag: v7.2.386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42624592cb9bd244cb92ae07d06e84ae1ff88c34;p=thirdparty%2Fvim.git

updated for version 7.2.386
Problem:    Focus hack for KDE 3.1 causes problems for other window managers.
Solution:   Remove the hack. (forwarded by Joel Bradshaw)
---

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 0535e204f7..6a657a3ee8 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -2313,19 +2313,6 @@ gui_mch_dialog(int	type,	    /* type of dialog */
 	gtk_widget_destroy(dialog);
     }
 
-    /* Terrible hack: When the text area still has focus when we remove the
-     * dialog, somehow gvim loses window focus.  This is with "point to type"
-     * in the KDE 3.1 window manager.  Warp the mouse pointer to outside the
-     * window and back to avoid that. */
-    if (!gui.in_focus)
-    {
-	int x, y;
-
-	gdk_window_get_pointer(gui.drawarea->window, &x, &y, NULL);
-	gui_mch_setmouse(-100, -100);
-	gui_mch_setmouse(x, y);
-    }
-
     return response > 0 ? response : 0;
 }
 
diff --git a/src/version.c b/src/version.c
index b4f673676a..46014e2281 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    386,
 /**/
     385,
 /**/