commit 81695250ef1bbc02016078044ac268129a33f333
author Bram Moolenaar <Bram@vim.org> Wed Dec 29 20:58:21 2004 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Dec 29 20:58:21 2004 +0000
tree c31ec7182b5b06ffeb5a14b79701127eaa5c0dc8
parent 86b68359978c933419279e599d0a8cf536095d77

updated for version 7.0026

src/mbyte.c

diff --git a/src/mbyte.c b/src/mbyte.c
index 8b997af..2278de6 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4341,6 +4341,7 @@
     }
 }
 
+#ifndef FEAT_GUI_KDE
 /*ARGSUSED*/
     void
 im_set_position(row, col)
@@ -4349,6 +4350,7 @@
 {
     xim_set_preedit();
 }
+#endif
 
 /*
  * Set the XIM to the current cursor position.
@@ -4642,7 +4644,7 @@
 #endif
 }
 
-#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
+#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
 static char e_xim[] = N_("E285: Failed to create input context");
 #endif
 
@@ -5414,7 +5416,7 @@
     if (xim_input_style & (int)GDK_IM_STATUS_AREA)
 	return gui.char_height;
 #elif defined FEAT_GUI_KDE
-#warning FIXME
+    /* always return zero? */
 #else
     if (status_area_enabled)
 	return gui.char_height;
@@ -5435,6 +5437,10 @@
     if (xim_input_style & (int)GDK_IM_PREEDIT_CALLBACKS)
 	return xim_can_preediting;
 #  endif
+#  ifdef FEAT_GUI_KDE
+    if (preedit_start_col != MAXCOL)
+	return TRUE;
+#  endif
     return xim_has_focus;
 }