merged with vim74-kaoriya-win64-20130811

Author: splhack

src/GvimExt/gvimext.cpp

@@ -105,30 +105,6 @@ getGvimNameW(wchar_t *nameW)
 getRuntimeDir(char *buf)
 {
     int		idx;
-    HKEY	hkey;
-
-    /*
-     * Get runtime path from the registry if entry exists.
-     */
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0,
-		KEY_READ, &hkey) == ERROR_SUCCESS)
-    {
-	DWORD dwLen = MAX_PATH;
-	LONG result = RegQueryValueEx(hkey, "runtime", 0, NULL, (BYTE*)buf,
-		&dwLen);
-
-	RegCloseKey(hkey);
-	if (result == ERROR_SUCCESS)
-	{
-	    /* Add directory separater if needs */
-	    if (dwLen > 1 && !strchr("\\/", buf[dwLen - 2]))
-	    {
-		buf[dwLen - 1]	= '\\';
-		buf[dwLen    ]	= '\0';
-	    }
-	    return; /* success to obtain runtime entry */
-	}
-    }
 
     getGvimName(buf, 1);
     if (buf[0] != 0)

src/ex_getln.c

@@ -5442,13 +5442,6 @@ in_history(type, str, move_to_front, sep, writing)
 		&& !(writing && history[type][i].viminfo)
 		&& (type != HIST_SEARCH || sep == p[STRLEN(p) + 1]))
 	{
-	    char_u *p = history[type][i].hisstr;
-
-	    /* For search history, equation check includes first characters
-	     * equation. */
-	    if (type == HIST_SEARCH && sep != p[STRLEN(p) + 1])
-		break;
-
 	    if (!move_to_front)
 		return TRUE;
 	    last_i = i;

src/gui_w32.c

@@ -25,11 +25,11 @@
 
 #include "vim.h"
 
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 # include "gui_dwrite.h"
 #endif
 
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 static DWriteContext *s_dwc = NULL;
 static int s_directx_enabled = 0;
 static int s_directx_load_attempted = 0;
@@ -74,7 +74,7 @@ gui_mch_set_rendering_options(char_u *s)
 	char_u  name[128];
 	char_u  value[128];
 
-	copy_option_part(&p, item, sizeof(item), ","); 
+	copy_option_part(&p, item, sizeof(item), ",");
 	if (p == NULL)
 	    break;
 	q = &item[0];
@@ -1906,7 +1906,7 @@ gui_mch_set_shellsize(int width, int height,
                          GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
     win_height = height + (GetSystemMetrics(SM_CYFRAME) +
                            GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
-			+ GetSystemMetrics(SM_CYCAPTION)
+			+ get_caption_height()
 #ifdef FEAT_MENU
 			+ gui_mswin_get_menu_height(FALSE)
 #endif
@@ -2625,7 +2625,7 @@ gui_mch_draw_string(
 	    if (text[n] >= 0x80)
 		break;
 
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
     /* Quick hack to enable DirectWrite.  To use DirectWrite (antialias), it is
      * required that unicode drawing routine, currently.  So this forces it
      * enabled. */
@@ -2691,14 +2691,14 @@ gui_mch_draw_string(
 	    i += utfc_ptr2len_len(text + i, len - i);
 	    ++clen;
 	}
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 	if (IS_ENABLE_DIRECTX() && font_is_ttf_or_vector)
 	{
 	    DWriteContext_DrawText(s_dwc, s_hdc, unicodebuf, wlen,
 		    TEXT_X(col), TEXT_Y(row), FILL_X(cells), FILL_Y(1),
 		    gui.char_width, gui.currFgColor);
 	}
-        else
+	else
 #endif
 	    ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
 		    foptions, pcliprect, unicodebuf, wlen, unicodepdy);
@@ -2839,7 +2839,7 @@ gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
     *screen_h = workarea_rect.bottom - workarea_rect.top
 		- (GetSystemMetrics(SM_CYFRAME) +
                    GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
-		- GetSystemMetrics(SM_CYCAPTION)
+		- get_caption_height()
 #ifdef FEAT_MENU
 		- gui_mswin_get_menu_height(FALSE)
 #endif

src/gui_w48.c

@@ -2786,7 +2786,7 @@ _OnPaint(
 
 	out_flush();	    /* make sure all output has been processed */
 	(void)BeginPaint(hwnd, &ps);
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 	if (IS_ENABLE_DIRECTX())
 	    DWriteContext_BeginDraw(s_dwc);
 #endif
@@ -2806,7 +2806,7 @@ _OnPaint(
 
 	if (!IsRectEmpty(&ps.rcPaint))
 	{
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 	    if (IS_ENABLE_DIRECTX())
 		DWriteContext_BindDC(s_dwc, s_hdc, &ps.rcPaint);
 #endif
@@ -2815,7 +2815,7 @@ _OnPaint(
 		    ps.rcPaint.bottom - ps.rcPaint.top + 1);
 	}
 
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
 	if (IS_ENABLE_DIRECTX())
 	    DWriteContext_EndDraw(s_dwc);
 #endif
@@ -2936,7 +2936,7 @@ gui_mswin_get_valid_dimensions(
     base_height = gui_get_base_height()
 	+ (GetSystemMetrics(SM_CYFRAME) +
            GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
-	+ GetSystemMetrics(SM_CYCAPTION)
+	+ get_caption_height()
 #ifdef FEAT_MENU
 	+ gui_mswin_get_menu_height(FALSE)
 #endif
@@ -3059,7 +3059,7 @@ gui_mch_insert_lines(
     void
 gui_mch_exit(int rc)
 {
-#if defined(FEAT_DIRECTX)
+#ifdef FEAT_DIRECTX
     DWriteContext_Close(s_dwc);
     DWrite_Final();
     s_dwc = NULL;
@@ -3309,7 +3309,7 @@ gui_mch_newfont()
 		     rect.bottom - rect.top
 			- (GetSystemMetrics(SM_CYFRAME) +
                            GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
-			- GetSystemMetrics(SM_CYCAPTION)
+			- get_caption_height()
 #ifdef FEAT_MENU
 			- gui_mswin_get_menu_height(FALSE)
 #endif

src/mbyte.c

@@ -4478,7 +4478,22 @@ im_set_active(int active)
     im_is_active = (active && !p_imdisable);
 
     if (im_is_active != was_active)
+    {
+#  ifdef FEAT_EVAL
+	if (p_imaf[0] != NUL)
+	{
+	    char_u *argv[1];
+
+	    if (active)
+		argv[0] = (char_u *)"1";
+	    else
+		argv[0] = (char_u *)"0";
+	    (void)call_func_retnr(p_imaf, 1, argv, FALSE);
+	    return;
+	}
+#  endif
 	xim_reset();
+    }
 }
 
     void

src/ui.c

@@ -3262,6 +3262,17 @@ ui_focus_change(in_focus)
 im_save_status(psave)
     long *psave;
 {
+# if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+    if (!p_imdisable && KeyTyped && !KeyStuffed && p_imsf[0] != NUL)
+    {
+	if (vgetc_im_active)
+	    *psave = B_IMODE_IM;
+	else if (*psave == B_IMODE_IM)
+	    *psave = B_IMODE_NONE;
+	return;
+    }
+# endif
+
     /* Don't save when 'imdisable' is set or "xic" is NULL, IM is always
      * disabled then (but might start later).
      * Also don't save when inside a mapping, vgetc_im_active has not been set