summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-03-10 12:25:03 +0100
committerBram Moolenaar <Bram@vim.org>2010-03-10 12:25:03 +0100
commit42624592cb9bd244cb92ae07d06e84ae1ff88c34 (patch)
tree209fd55e5b3be14f48647d040e0a8e78242b8988
parentf679a43dbb969b0bb81903abe6b61a63a7d4a22f (diff)
downloadvim-git-42624592cb9bd244cb92ae07d06e84ae1ff88c34.tar.gz
updated for version 7.2.386v7.2.386
Problem: Focus hack for KDE 3.1 causes problems for other window managers. Solution: Remove the hack. (forwarded by Joel Bradshaw)
-rw-r--r--src/gui_gtk.c13
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 13 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 0535e204f..6a657a3ee 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 b4f673676..46014e228 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 386,
+/**/
385,
/**/
384,