Various small fixes from Dominique Pelle.

18 files changed, 1412 insertions, 1089 deletions

diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 236901c618..355c909962 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -525,7 +525,7 @@ PHP indenting can be altered in several ways by modifying the values of some
 variables:
 
 								*php-comment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
 own 'formatoptions'): >
     :let g:PHP_autoformatcomment = 0
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 255e00f5f6..5e4f3a0aa7 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1099,7 +1099,6 @@ Vim 7.3:
   dictionary: {'nr': 2, 'time': 1234, 'saved': 1}
 Patches to include:
 - Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
-- Minor patches from Dominique Pelle, 2010 May 15
 - Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
 - Patch to support netbeans for Mac. (Kazuki Sakamoto, 2009 Jun 25)
 - Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
diff --git a/src/INSTALL b/src/INSTALL
index 82275d452d..dd50e0dc26 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -55,7 +55,7 @@ arguments.
 
 GNU Autoconf and a few other tools have been used to make Vim work on many
 different Unix systems.  The advantage of this is that Vim should compile
-on most sytems without any adjustments.  The disadvantage is that when
+on most systems without any adjustments.  The disadvantage is that when
 adjustments are required, it takes some time to understand what is happening.
 
 If configure finds all library files and then complains when linking that some
@@ -138,7 +138,7 @@ work very well and there was no maintainer it was dropped.
 Unix: COMPILING WITH MULTI-BYTE
 
 When you want to compile with the multi-byte features enabled, make sure you
-compile on a machine where the locale settings actually work.  otherwise the
+compile on a machine where the locale settings actually work, otherwise the
 configure tests may fail.  You need to compile with "big" features:
 
     ./configure --with-features=big
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 23651bdb6f..84aa710c04 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4013,7 +4013,7 @@ gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
     /*
      * FIXME: dirty trick: Because the gui_get_base_height() doesn't include
      * the toolbar and menubar for GTK, we subtract them from the screen
-     * hight, so that the window size can be made to fit on the screen.
+     * height, so that the window size can be made to fit on the screen.
      * This should be completely changed later.
      */
     *screen_w -= get_menu_tool_width();
@@ -4818,7 +4818,7 @@ count_cluster_cells(char_u *s, PangoItem *item,
  * If ink_rect.x is negative Pango apparently has taken care of the composing
  * by itself.  Actually setting x_offset = 0 should be sufficient then, but due
  * to problems with composing from different fonts we still need to fine-tune
- * x_offset to avoid uglyness.
+ * x_offset to avoid ugliness.
  *
  * If ink_rect.x is not negative, force overstriking by pointing x_offset to
  * the position of the previous glyph.	Apparently this happens only with old
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 8b37272938..73bc76f763 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1162,9 +1162,9 @@ gui_x11_mouse_cb(w, dud, event, dum)
 /* ARGSUSED */
     static void
 gui_x11_sniff_request_cb(closure, source, id)
-    XtPointer	closure;
-    int		*source;
-    XtInputId	*id;
+    XtPointer	closure UNUSED;
+    int		*source UNUSED;
+    XtInputId	*id UNUSED;
 {
     static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
 
diff --git a/src/gui_xmdlg.c b/src/gui_xmdlg.c
index 072a53c00c..1ae755e822 100644
--- a/src/gui_xmdlg.c
+++ b/src/gui_xmdlg.c
@@ -168,7 +168,7 @@ name_part(char *font, char *buf)
     get_part(font, 2, buf2);
     get_part(font, 1, buf3);
 
-    if (strlen(buf3))
+    if (*buf3 != NUL)
 	vim_snprintf(buf, TEMP_BUF_SIZE, "%s (%s)", buf2, buf3);
     else
 	vim_snprintf(buf, TEMP_BUF_SIZE, "%s", buf2);
@@ -225,7 +225,7 @@ size_part(char *font, char *buf, int inPixels)
     if (inPixels)
     {
 	get_part(font, 7, buf);
-	if (strlen(buf) > 0)
+	if (*buf != NUL)
 	{
 	    size = atoi(buf);
 	    sprintf(buf, "%3d", size);
@@ -234,7 +234,7 @@ size_part(char *font, char *buf, int inPixels)
     else
     {
 	get_part(font, 8, buf);
-	if (strlen(buf) > 0)
+	if (*buf != NUL)
 	{
 	    size = atoi(buf);
 	    temp = (float)size / 10.0;
@@ -261,7 +261,7 @@ encoding_part(char *font, char *buf)
     get_part(font, 13, buf1);
     get_part(font, 14, buf2);
 
-    if (strlen(buf1) > 0 && strlen(buf2))
+    if (*buf1 != NUL && *buf2 != NUL)
 	vim_snprintf(buf, TEMP_BUF_SIZE, "%s-%s", buf1, buf2);
     if (!strcmp(buf, " "))
 	strcpy(buf, "-");
@@ -1229,10 +1229,10 @@ gui_xm_select_font(char_u *current)
 	    size_part(found, sizebuf, data->in_pixels);
 	    encoding_part(found, encodingbuf);
 
-	    if (strlen(namebuf) > 0
-		    && strlen(stylebuf) > 0
-		    && strlen(sizebuf) > 0
-		    && strlen(encodingbuf) > 0)
+	    if (*namebuf != NUL
+		    && *stylebuf != NUL
+		    && *sizebuf != NUL
+		    && *encodingbuf != NUL)
 	    {
 		data->sel[NAME] = XtNewString(namebuf);
 		data->sel[STYLE] = XtNewString(stylebuf);
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 6ab9c2403c..8eaa037699 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -588,7 +588,7 @@ staterr:
 		)
 	{
 	    fname[strlen(fname)-1] = '\0';
-	    if (strlen(fname) == 0)
+	    if (fname[0] == '\0')
 		break;
 	}
 	if (fname[0] == '\0')
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index af56cd0157..f31ea0663b 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -175,7 +175,7 @@ static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 #endif
 
 #ifdef MZ_PRECISE_GC
-static int buffer_size_proc(void *obj)
+static int buffer_size_proc(void *obj UNUSED)
 {
     return gcBYTES_TO_WORDS(sizeof(vim_mz_buffer));
 }
@@ -187,7 +187,7 @@ static int buffer_fixup_proc(void *obj)
 {
     return buffer_size_proc(obj);
 }
-static int window_size_proc(void *obj)
+static int window_size_proc(void *obj UNUSED)
 {
     return gcBYTES_TO_WORDS(sizeof(vim_mz_window));
 }
@@ -708,16 +708,16 @@ static void remove_timer(void);
 /* timers are presented in GUI only */
 # if defined(FEAT_GUI_W32)
     static void CALLBACK
-timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT idEvent UNUSED, DWORD dwTime UNUSED)
 # elif defined(FEAT_GUI_GTK)
     static gint
-timer_proc(gpointer data)
+timer_proc(gpointer data UNUSED)
 # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
     static void
-timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
+timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
 # elif defined(FEAT_GUI_MAC)
     pascal void
-timer_proc(EventLoopTimerRef theTimer, void *userData)
+timer_proc(EventLoopTimerRef theTimer UNUSED, void *userData UNUSED)
 # endif
 {
     scheme_check_threads();
@@ -806,7 +806,7 @@ mzscheme_main(void)
 }
 
     static int
-mzscheme_env_main(Scheme_Env *env, int argc, char **argv)
+mzscheme_env_main(Scheme_Env *env, int argc UNUSED, char **argv UNUSED)
 {
     /* neither argument nor return values are used */
 #ifdef MZ_PRECISE_GC
@@ -1190,7 +1190,7 @@ ex_mzscheme(exarg_T *eap)
 }
 
     static Scheme_Object *
-do_load(void *data, int noargc, Scheme_Object **noargv)
+do_load(void *data, int noargc UNUSED, Scheme_Object **noargv UNUSED)
 {
     Scheme_Object   *expr = NULL;
     Scheme_Object   *result = NULL;
@@ -1306,7 +1306,7 @@ extract_exn_message(Scheme_Object *v)
 }
 
     static Scheme_Object *
-do_eval(void *s, int noargc, Scheme_Object **noargv)
+do_eval(void *s, int noargc UNUSED, Scheme_Object **noargv UNUSED)
 {
     return scheme_eval_string_all((char *)s, environment, TRUE);
 }
@@ -1317,7 +1317,7 @@ do_eval(void *s, int noargc, Scheme_Object **noargv)
  *========================================================================
  */
     static void
-do_intrnl_output(char *mesg, long len, int error)
+do_intrnl_output(char *mesg, int error)
 {
     char *p, *prev;
 
@@ -1341,21 +1341,21 @@ do_intrnl_output(char *mesg, long len, int error)
 }
 
     static void
-do_output(char *mesg, long len)
+do_output(char *mesg, long len UNUSED)
 {
-    do_intrnl_output(mesg, len, 0);
+    do_intrnl_output(mesg, 0);
 }
 
     static void
-do_err_output(char *mesg, long len)
+do_err_output(char *mesg)
 {
-    do_intrnl_output(mesg, len, 1);
+    do_intrnl_output(mesg, 1);
 }
 
     static void
 do_printf(char *format, ...)
 {
-    do_intrnl_output(format, STRLEN(format), 1);
+    do_intrnl_output(format, 1);
 }
 
     static void
@@ -1368,7 +1368,7 @@ do_flush(void)
     MZ_GC_CHECK();
     if (length)
     {
-	do_err_output(buff, length);
+	do_err_output(buff);
 	return;
     }
 
@@ -1438,21 +1438,21 @@ vim_eval(void *data, int argc, Scheme_Object **argv)
 
 /* (range-start) */
     static Scheme_Object *
-get_range_start(void *data, int argc, Scheme_Object **argv)
+get_range_start(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     return scheme_make_integer(range_start);
 }
 
 /* (range-end) */
     static Scheme_Object *
-get_range_end(void *data, int argc, Scheme_Object **argv)
+get_range_end(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     return scheme_make_integer(range_end);
 }
 
 /* (beep) */
     static Scheme_Object *
-mzscheme_beep(void *data, int argc, Scheme_Object **argv)
+mzscheme_beep(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     vim_beep();
     return scheme_void;
@@ -1584,14 +1584,14 @@ set_option(void *data, int argc, Scheme_Object **argv)
 
 /* (curr-win) */
     static Scheme_Object *
-get_curr_win(void *data, int argc, Scheme_Object **argv)
+get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     return (Scheme_Object *)get_vim_curr_window();
 }
 
 /* (win-count) */
     static Scheme_Object *
-get_window_count(void *data, int argc, Scheme_Object **argv)
+get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     win_T   *w;
     int	    n = 0;
@@ -1926,7 +1926,7 @@ get_buffer_num(void *data, int argc, Scheme_Object **argv)
 
 /* (buff-count) */
     static Scheme_Object *
-get_buffer_count(void *data, int argc, Scheme_Object **argv)
+get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     buf_T   *b;
     int	    n = 0;
@@ -1947,7 +1947,7 @@ get_buffer_name(void *data, int argc, Scheme_Object **argv)
 
 /* (curr-buff) */
     static Scheme_Object *
-get_curr_buffer(void *data, int argc, Scheme_Object **argv)
+get_curr_buffer(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     return (Scheme_Object *)get_vim_curr_buffer();
 }
@@ -2521,7 +2521,7 @@ insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
  */
 /* (buff? obj) */
     static Scheme_Object *
-vim_bufferp(void *data, int argc, Scheme_Object **argv)
+vim_bufferp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
 {
     if (SCHEME_VIMBUFFERP(argv[0]))
 	return scheme_true;
@@ -2531,7 +2531,7 @@ vim_bufferp(void *data, int argc, Scheme_Object **argv)
 
 /* (win? obj) */
     static Scheme_Object *
-vim_windowp(void *data, int argc, Scheme_Object **argv)
+vim_windowp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
 {
     if (SCHEME_VIMWINDOWP(argv[0]))
 	return scheme_true;
@@ -2541,7 +2541,7 @@ vim_windowp(void *data, int argc, Scheme_Object **argv)
 
 /* (buff-valid? obj) */
     static Scheme_Object *
-vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
+vim_buffer_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
 {
     if (SCHEME_VIMBUFFERP(argv[0])
 	    && ((vim_mz_buffer *)argv[0])->buf != INVALID_BUFFER_VALUE)
@@ -2552,7 +2552,7 @@ vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
 
 /* (win-valid? obj) */
     static Scheme_Object *
-vim_window_validp(void *data, int argc, Scheme_Object **argv)
+vim_window_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
 {
     if (SCHEME_VIMWINDOWP(argv[0])
 	    && ((vim_mz_window *)argv[0])->win != INVALID_WINDOW_VALUE)
@@ -3315,7 +3315,7 @@ sandbox_check(void)
 
 /* security guards to force Vim's sandbox restrictions on MzScheme level */
     static Scheme_Object *
-sandbox_file_guard(int argc, Scheme_Object **argv)
+sandbox_file_guard(int argc UNUSED, Scheme_Object **argv)
 {
     if (sandbox)
     {
@@ -3361,7 +3361,7 @@ sandbox_file_guard(int argc, Scheme_Object **argv)
 }
 
     static Scheme_Object *
-sandbox_network_guard(int argc, Scheme_Object **argv)
+sandbox_network_guard(int argc UNUSED, Scheme_Object **argv UNUSED)
 {
     return scheme_void;
 }
diff --git a/src/mbyte.c b/src/mbyte.c
index 939173ec39..8a86859a90 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4205,7 +4205,7 @@ iconv_end()
 
 #if defined(FEAT_XIM) || defined(PROTO)
 
-# ifdef FEAT_GUI_GTK
+# if defined(FEAT_GUI_GTK) || defined(PROTO)
 static int xim_has_preediting INIT(= FALSE);  /* IM current status */
 
 /*
@@ -4221,9 +4221,6 @@ init_preedit_start_col(void)
     /* Prevent that preediting marks the buffer as changed. */
     xim_changed_while_preediting = curbuf->b_changed;
 }
-# endif
-
-# if defined(FEAT_GUI_GTK) && !defined(PROTO)
 
 static int im_is_active	       = FALSE;	/* IM is enabled for current mode    */
 static int preedit_is_active   = FALSE;
@@ -5058,6 +5055,18 @@ im_get_status(void)
     return im_is_active;
 }
 
+    int
+preedit_get_status(void)
+{
+    return preedit_is_active;
+}
+
+    int
+im_is_preediting()
+{
+    return xim_has_preediting;
+}
+
 # else /* !FEAT_GUI_GTK */
 
 static int	xim_is_active = FALSE;  /* XIM should be active in the current
@@ -5192,111 +5201,6 @@ xim_set_preedit()
     }
 }
 
-/*
- * Set up the status area.
- *
- * This should use a separate Widget, but that seems not possible, because
- * preedit_area and status_area should be set to the same window as for the
- * text input.  Unfortunately this means the status area pollutes the text
- * window...
- */
-    void
-xim_set_status_area()
-{
-    if (xic == NULL)
-	return;
-
-    XVaNestedList preedit_list = 0, status_list = 0, list = 0;
-    XRectangle pre_area, status_area;
-
-    if (input_style & XIMStatusArea)
-    {
-	if (input_style & XIMPreeditArea)
-	{
-	    XRectangle *needed_rect;
-
-	    /* to get status_area width */
-	    status_list = XVaCreateNestedList(0, XNAreaNeeded,
-					      &needed_rect, NULL);
-	    XGetICValues(xic, XNStatusAttributes, status_list, NULL);
-	    XFree(status_list);
-
-	    status_area.width = needed_rect->width;
-	}
-	else
-	    status_area.width = gui.char_width * Columns;
-
-	status_area.x = 0;
-	status_area.y = gui.char_height * Rows + gui.border_offset;
-	if (gui.which_scrollbars[SBAR_BOTTOM])
-	    status_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
-	if (gui.menu_is_active)
-	    status_area.y += gui.menu_height;
-#endif
-	status_area.height = gui.char_height;
-	status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL);
-    }
-    else
-    {
-	status_area.x = 0;
-	status_area.y = gui.char_height * Rows + gui.border_offset;
-	if (gui.which_scrollbars[SBAR_BOTTOM])
-	    status_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
-	if (gui.menu_is_active)
-	    status_area.y += gui.menu_height;
-#endif
-	status_area.width = 0;
-	status_area.height = gui.char_height;
-    }
-
-    if (input_style & XIMPreeditArea)   /* off-the-spot */
-    {
-	pre_area.x = status_area.x + status_area.width;
-	pre_area.y = gui.char_height * Rows + gui.border_offset;
-	pre_area.width = gui.char_width * Columns - pre_area.x;
-	if (gui.which_scrollbars[SBAR_BOTTOM])
-	    pre_area.y += gui.scrollbar_height;
-#ifdef FEAT_MENU
-	if (gui.menu_is_active)
-	    pre_area.y += gui.menu_height;
-#endif
-	pre_area.height = gui.char_height;
-	preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
-    }
-    else if (input_style & XIMPreeditPosition)   /* over-the-spot */
-    {
-	pre_area.x = 0;
-	pre_area.y = 0;
-	pre_area.height = gui.char_height * Rows;
-	pre_area.width = gui.char_width * Columns;
-	preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
-    }
-
-    if (preedit_list && status_list)
-	list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
-				   XNStatusAttributes, status_list, NULL);
-    else if (preedit_list)
-	list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
-				   NULL);
-    else if (status_list)
-	list = XVaCreateNestedList(0, XNStatusAttributes, status_list,
-				   NULL);
-    else
-	list = NULL;
-
-    if (list)
-    {
-	XSetICValues(xic, XNVaNestedList, list, NULL);
-	XFree(list);
-    }
-    if (status_list)
-	XFree(status_list);
-    if (preedit_list)
-	XFree(preedit_list);
-}
-
 #if defined(FEAT_GUI_X11)
 static char e_xim[] = N_("E285: Failed to create input context");
 #endif
@@ -5607,14 +5511,6 @@ xim_real_init(x11_window, x11_display)
 
 #endif /* FEAT_GUI_X11 */
 
-    int
-xim_get_status_area_height()
-{
-    if (status_area_enabled)
-	return gui.char_height;
-    return 0;
-}
-
 /*
  * Get IM status.  When IM is on, return TRUE.  Else return FALSE.
  * FIXME: This doesn't work correctly: Having focus doesn't always mean XIM is
@@ -5629,21 +5525,121 @@ im_get_status()
 
 # endif /* !FEAT_GUI_GTK */
 
-# if defined(FEAT_GUI_GTK) || defined(PROTO)
-    int
-preedit_get_status(void)
+# if !defined(FEAT_GUI_GTK) || defined(PROTO)
+/*
+ * Set up the status area.
+ *
+ * This should use a separate Widget, but that seems not possible, because
+ * preedit_area and status_area should be set to the same window as for the
+ * text input.  Unfortunately this means the status area pollutes the text
+ * window...
+ */
+    void
+xim_set_status_area()
 {
-    return preedit_is_active;
+    if (xic == NULL)
+	return;
+
+    XVaNestedList preedit_list = 0, status_list = 0, list = 0;
+    XRectangle pre_area, status_area;
+
+    if (input_style & XIMStatusArea)
+    {
+	if (input_style & XIMPreeditArea)
+	{
+	    XRectangle *needed_rect;
+
+	    /* to get status_area width */
+	    status_list = XVaCreateNestedList(0, XNAreaNeeded,
+					      &needed_rect, NULL);
+	    XGetICValues(xic, XNStatusAttributes, status_list, NULL);
+	    XFree(status_list);
+
+	    status_area.width = needed_rect->width;
+	}
+	else
+	    status_area.width = gui.char_width * Columns;
+
+	status_area.x = 0;
+	status_area.y = gui.char_height * Rows + gui.border_offset;
+	if (gui.which_scrollbars[SBAR_BOTTOM])
+	    status_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+	if (gui.menu_is_active)
+	    status_area.y += gui.menu_height;
+#endif
+	status_area.height = gui.char_height;
+	status_list = XVaCreateNestedList(0, XNArea, &status_area, NULL);
+    }
+    else
+    {
+	status_area.x = 0;
+	status_area.y = gui.char_height * Rows + gui.border_offset;
+	if (gui.which_scrollbars[SBAR_BOTTOM])
+	    status_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+	if (gui.menu_is_active)
+	    status_area.y += gui.menu_height;
+#endif
+	status_area.width = 0;
+	status_area.height = gui.char_height;
+    }
+
+    if (input_style & XIMPreeditArea)   /* off-the-spot */
+    {
+	pre_area.x = status_area.x + status_area.width;
+	pre_area.y = gui.char_height * Rows + gui.border_offset;
+	pre_area.width = gui.char_width * Columns - pre_area.x;
+	if (gui.which_scrollbars[SBAR_BOTTOM])
+	    pre_area.y += gui.scrollbar_height;
+#ifdef FEAT_MENU
+	if (gui.menu_is_active)
+	    pre_area.y += gui.menu_height;
+#endif
+	pre_area.height = gui.char_height;
+	preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
+    }
+    else if (input_style & XIMPreeditPosition)   /* over-the-spot */
+    {
+	pre_area.x = 0;
+	pre_area.y = 0;
+	pre_area.height = gui.char_height * Rows;
+	pre_area.width = gui.char_width * Columns;
+	preedit_list = XVaCreateNestedList(0, XNArea, &pre_area, NULL);
+    }
+
+    if (preedit_list && status_list)
+	list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
+				   XNStatusAttributes, status_list, NULL);
+    else if (preedit_list)
+	list = XVaCreateNestedList(0, XNPreeditAttributes, preedit_list,
+				   NULL);
+    else if (status_list)
+	list = XVaCreateNestedList(0, XNStatusAttributes, status_list,
+				   NULL);
+    else
+	list = NULL;
+
+    if (list)
+    {
+	XSetICValues(xic, XNVaNestedList, list, NULL);
+	XFree(list);
+    }
+    if (status_list)
+	XFree(status_list);
+    if (preedit_list)
+	XFree(preedit_list);
 }
-# endif
 
-# if defined(FEAT_GUI_GTK) || defined(PROTO)
     int
-im_is_preediting()
+xim_get_status_area_height()
 {
-    return xim_has_preediting;
+    if (status_area_enabled)
+	return gui.char_height;
+    return 0;
 }
 # endif
+
 #endif /* FEAT_XIM */
 
 #if defined(FEAT_MBYTE) || defined(PROTO)
diff --git a/src/netbeans.c b/src/netbeans.c
index e674fd8222..00c7ce20b9 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -3494,7 +3494,7 @@ netbeans_draw_multisign_indicator(int row)
 }
 #endif /* FEAT_GUI_MOTIF */
 
-#ifdef FEAT_GUI_GTK
+#if defined(FEAT_GUI_GTK) && !defined(PROTO)
 /*
  * We have multiple signs to draw at the same location. Draw the
  * multi-sign indicator instead. This is the GTK/Gnome version.
diff --git a/src/ops.c b/src/ops.c
index 3233750137..aa1fca4b42 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5444,7 +5444,7 @@ write_viminfo_registers(fp)
     int	    max_kbyte;
     long    len;
 
-    fprintf(fp, _("\n# Registers:\n"));
+    fputs(_("\n# Registers:\n"), fp);
 
     /* Get '<' value, use old '"' value if '<' is not found. */
     max_num_lines = get_viminfo_parameter('<');
@@ -5474,7 +5474,7 @@ write_viminfo_registers(fp)
 	num_lines = y_regs[i].y_size;
 	if (num_lines == 0
 		|| (num_lines == 1 && y_regs[i].y_type == MCHAR
-					&& STRLEN(y_regs[i].y_array[0]) == 0))
+					&& *y_regs[i].y_array[0] == NUL))
 	    continue;
 
 	if (max_kbyte > 0)
diff --git a/src/os_vms.c b/src/os_vms.c
index 7954294b91..59d9810e24 100644
--- a/src/os_vms.c
+++ b/src/os_vms.c
@@ -409,8 +409,7 @@ vms_wproc(char *name, int val)
     int
 mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags)
 {
-    int		i, j = 0, cnt = 0;
-    char	*cp;
+    int		i, cnt = 0;
     char_u	buf[MAXPATHL];
     int		dir;
     int files_alloced, files_free;
@@ -481,7 +480,6 @@ mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, i
 mch_expandpath(garray_T *gap, char_u *path, int flags)
 {
     int		i,cnt = 0;
-    char	*cp;
     vms_match_num = 0;
 
     cnt = decc$to_vms(decc$translate_vms(vms_fixfilename(path)), vms_wproc, 1, 0);
diff --git a/src/os_win16.c b/src/os_win16.c
index 1cf3ff8e93..ba3407241e 100644
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -193,8 +193,6 @@ mch_check_win(
     int argc,
     char **argv)
 {
-    int		i;
-
     return OK;	    /* GUI always has a tty */
 }
 
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 940b6ba689..2110fe7f35 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -12,16 +12,31 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 7.1\n"
+"Project-Id-Version: vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:51+0200\n"
-"PO-Revision-Date: 2008-03-07 13:57+0300\n"
+"POT-Creation-Date: 2010-06-25 15:34+0300\n"
+"PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: Викликано bf_key_init() з порожнім паролем"
+
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Неправильне використання порядку байтів Blowfish (BE/LE)"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: Не пройшла перевірка sha256"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Не пройшла перевірка Blowfish"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Немає можливості розмістити хоч один буфер, завершення роботи..."
 
@@ -42,7 +57,7 @@ msgstr "Вивантажено один буфер"
 
 #, c-format
 msgid "%d buffers unloaded"
-msgstr "Вивантажено буферів -- %d"
+msgstr "Вивантажено %d буфери(ів)"
 
 msgid "1 buffer deleted"
 msgstr "Знищено один буфер"
@@ -56,7 +71,7 @@ msgstr "Витерто один буфер"
 
 #, c-format
 msgid "%d buffers wiped out"
-msgstr "Витерто %d буфер(и)ів"
+msgstr "Витерто %d буфери(ів)"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: Жоден буфер не змінено"
@@ -67,7 +82,7 @@ msgstr "E85: У списку немає буферів"
 
 #, c-format
 msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Буферу %ld немає"
+msgstr "E86: Буфера %ld немає"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Це вже останній буфер"
@@ -114,7 +129,7 @@ msgid "[New file]"
 msgstr "[Новий файл]"
 
 msgid "[Read errors]"
-msgstr "[Помилка зчитування]"
+msgstr "[Помилки читання]"
 
 msgid "[readonly]"
 msgstr "[лише читати]"
@@ -187,22 +202,22 @@ msgstr "    рядок=%ld  id=%d назва=%s"
 
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Не зміг порівняти понад %ld буфери(ів) "
+msgstr "E96: Не можна порівнювати понад %ld буфери(ів)"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Не можна читати чи записувати тимчасові файли"
 
 msgid "E97: Cannot create diffs"
-msgstr "E97: Не зміг створити порівняння"
+msgstr "E97: Не вдалося створити порівняння"
 
 msgid "Patch file"
 msgstr "Латка"
 
 msgid "E816: Cannot read patch output"
-msgstr "E816: Не зміг прочитати результат patch"
+msgstr "E816: Не вдалося прочитати результат patch"
 
 msgid "E98: Cannot read diff output"
-msgstr "E98: Не зміг прочитати результат diff"
+msgstr "E98: Не вдалося прочитати результат diff"
 
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Цей буфер не в режимі порівняння"
@@ -220,7 +235,7 @@ msgstr ""
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Не зміг знайти буфер \"%s\""
+msgstr "E102: Не вдалося знайти буфер \"%s\""
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -233,7 +248,7 @@ msgid "E104: Escape not allowed in digraph"
 msgstr "E104: У диграфах не може міститися escape"
 
 msgid "E544: Keymap file not found"
-msgstr "E544: Не знайдено файлу розкладки"
+msgstr "E544: Не знайдено файл розкладки"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :loadkeymap використано не у файлі команд"
@@ -295,7 +310,7 @@ msgstr "Опція 'thesaurus' порожня"
 
 #, c-format
 msgid "Scanning dictionary: %s"
-msgstr "Скануємо словник: %s"
+msgstr "Сканується словник: %s"
 
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (вставка) Прогорнути (^E/^Y)"
@@ -311,7 +326,7 @@ msgid "Scanning tags."
 msgstr "Пошук серед теґів."
 
 msgid " Adding"
-msgstr " Додаємо"
+msgstr " Додається"
 
 #. showmode might reset the internal line pointers, so it must
 #. * be called before line = ml_get(), or when this address is no
@@ -415,7 +430,7 @@ msgstr "Друга ; у списку змінних"
 # msgstr "E235: "
 #, c-format
 msgid "E738: Can't list variables for %s"
-msgstr "E738: Не можна перелічити змінні у %s"
+msgstr "E738: Не можна перерахувати змінні у %s"
 
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Індексний доступ може бути тільки до списку чи словника"
@@ -433,7 +448,7 @@ msgid "E711: List value has not enough items"
 msgstr "E711: Список має недостатньо елементів"
 
 msgid "E690: Missing \"in\" after :for"
-msgstr "E690: Відсутнє \"in\" після :for"
+msgstr "E690: Пропущено \"in\" після :for"
 
 #, c-format
 msgid "E107: Missing parentheses: %s"
@@ -444,7 +459,7 @@ msgid "E108: No such variable: \"%s\""
 msgstr "E108: Змінної немає: \"%s\""
 
 msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: Змінна має забагато вкладень, щоб бути за-/відкритою."
+msgstr "E743: Змінна має забагато вкладень щоб бути за-/відкритою."
 
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Бракує ':' після '?'"
@@ -462,7 +477,7 @@ msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Некоректна операція над словником"
 
 msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Функцію можна порівняти тільки із функцією"
+msgstr "E693: Функцію можна порівняти тільки з функцією"
 
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Некоректна операція над функцією"
@@ -521,7 +536,7 @@ msgstr "E723: Немає кінцівки словника '}': %s"
 
 # msgstr "E21: "
 msgid "E724: variable nested too deep for displaying"
-msgstr "E724: У змінній занадто багато вкладень, щоб її показати"
+msgstr "E724: У змінній забагато вкладень щоб її показати"
 
 #, c-format
 msgid "E740: Too many arguments for function %s"
@@ -610,16 +625,16 @@ msgstr "E240: Немає з'єднання із сервером Vim"
 
 #, c-format
 msgid "E241: Unable to send to %s"
-msgstr "E241: Не зміг відіслати до %s"
+msgstr "E241: Не вдалося відіслати до %s"
 
 msgid "E277: Unable to read a server reply"
-msgstr "E277: Не зміг прочитати відповідь сервера"
+msgstr "E277: Не вдалося прочитати відповідь сервера"
 
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Забагато символьних посил