From c236c16d0884c7d6cdc4dbaddb8cb3992085f83e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 13 Jul 2008 17:41:49 +0000 Subject: updated for version 7.2b-000 --- src/gui.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/gui.c') diff --git a/src/gui.c b/src/gui.c index 09c3027cb1..8568d33ab4 100644 --- a/src/gui.c +++ b/src/gui.c @@ -958,7 +958,13 @@ gui_update_cursor(force, clear_selection) static int iid; guicolor_T fg, bg; - if (im_get_status()) + if ( +# ifdef HAVE_GTK2 + preedit_get_status() +# else + im_get_status() +# endif + ) { iid = syn_name2id((char_u *)"CursorIM"); if (iid > 0) @@ -5124,6 +5130,16 @@ gui_handle_drop(x, y, modifiers, fnames, count) { int i; char_u *p; + static int entered = FALSE; + + /* + * This function is called by event handlers. Just in case we get a + * second event before the first one is handled, ignore the second one. + * Not sure if this can ever happen, just in case. + */ + if (entered) + return; + entered = TRUE; /* * When the cursor is at the command line, add the file names to the @@ -5207,5 +5223,7 @@ gui_handle_drop(x, y, modifiers, fnames, count) gui_update_cursor(FALSE, FALSE); gui_mch_flush(); } + + entered = FALSE; } #endif -- cgit v1.2.3