Merge branch 'kaoriya' into master-update

Conflicts:
	plugins/vimproc/autoload/vimproc.vim
	plugins/vimproc/autoload/vimproc_win64.dll
	plugins/vimproc/doc/vimproc.txt
	src/mbyte.c
	src/misc2.c
	src/option.c

Author: splhack

src/auto/configure

@@ -5846,6 +5846,14 @@ $as_echo "OK" >&6; }
       vi_cv_perlsitelib=`$vi_cv_path_perl -MConfig -e 'print $Config{sitelibexp}'`
 
 
+      vi_cv_perl_extutils=unknown_perl_extutils_path
+      for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
+	xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"
+	if test -f "$xsubpp_path"; then
+	  vi_cv_perl_xsubpp="$xsubpp_path"
+	fi
+      done
+
       vi_cv_perl_extutils=unknown_perl_extutils_path
       for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
 	xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"

src/mbyte.c

@@ -4448,9 +4448,6 @@ iconv_end()
 #  define g_return_if_fail(x) if (!(x)) return;
 # endif
 
-# if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM) || defined(PROTO)
-static int xim_has_preediting INIT(= FALSE);  /* IM current status */
-
 static int im_is_active	       = FALSE;	/* IM is enabled for current mode    */
 static int preedit_is_active   = FALSE;
 
@@ -4463,6 +4460,11 @@ static unsigned int  im_activatekey_state  = 0;
 static GtkWidget *preedit_window = NULL;
 static GtkWidget *preedit_label = NULL;
 
+static void im_preedit_window_set_position(void);
+
+static GtkWidget *preedit_window = NULL;
+static GtkWidget *preedit_label = NULL;
+
 static void im_preedit_window_set_position(void);
 
     void
@@ -4570,6 +4572,27 @@ im_preedit_window_set_position(void)
 {
     int x, y, w, h, sw, sh;
 
+    if (preedit_window == NULL)
+	return;
+
+    sw = gdk_screen_get_width(gtk_widget_get_screen(preedit_window));
+    sh = gdk_screen_get_height(gtk_widget_get_screen(preedit_window));
+    gdk_window_get_origin(gui.drawarea->window, &x, &y);
+    gtk_window_get_size(GTK_WINDOW(preedit_window), &w, &h);
+    x = x + FILL_X(gui.col);
+    y = y + FILL_Y(gui.row);
+    if (x + w > sw)
+	x = sw - w;
+    if (y + h > sh)
+	y = sh - h;
+    gtk_window_move(GTK_WINDOW(preedit_window), x, y);
+}
+
+     static void
+im_preedit_window_set_position(void)
+{
+    int x, y, w, h, sw, sh;
+
     if (preedit_window == NULL)
 	return;
 
@@ -4856,13 +4879,6 @@ im_preedit_changed_macvim(char *preedit_string, int start_index, int cursor_inde
 	xim_has_preediting = TRUE;
 	im_show_preedit();
     }
-
-# ifndef FEAT_GUI_MACVIM
-    g_free(preedit_string);
-
-    if (gtk_main_level() > 0)
-	gtk_main_quit();
-# endif
 }
 
     void