]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.382 v7.3.382
authorBram Moolenaar <Bram@vim.org>
Thu, 15 Dec 2011 20:51:36 +0000 (21:51 +0100)
committerBram Moolenaar <Bram@vim.org>
Thu, 15 Dec 2011 20:51:36 +0000 (21:51 +0100)
Problem:    IME characters are inserted twice.
Solution:   Do not call DefWindowProc() if the event was handled. (Yasuhiro
            Matsumoto)

src/gui_w32.c
src/version.c

index c36f73d33ebc71ca8f0a73ac9d3e9dc879a42f1b..7c6896af0b0c2d6aa5ea101a084f8425fb6ce6d0 100644 (file)
@@ -798,7 +798,7 @@ _WndProc(
                if (pt.y < rect.top)
                {
                    show_tabline_popup_menu();
-                   return 0;
+                   return 0L;
                }
            }
            return MyWindowProc(hwnd, uMsg, wParam, lParam);
@@ -828,7 +828,10 @@ _WndProc(
 
     case WM_ENDSESSION:
        if (wParam)     /* system only really goes down when wParam is TRUE */
+       {
            _OnEndSession();
+           return 0L;
+       }
        break;
 
     case WM_CHAR:
@@ -866,7 +869,7 @@ _WndProc(
         * are received, mouse pointer remains hidden. */
        return MyWindowProc(hwnd, uMsg, wParam, lParam);
 #else
-       return 0;
+       return 0L;
 #endif
 
     case WM_SIZING:    /* HANDLE_MSG doesn't seem to handle this one */
@@ -874,7 +877,7 @@ _WndProc(
 
     case WM_MOUSEWHEEL:
        _OnMouseWheel(hwnd, HIWORD(wParam));
-       break;
+       return 0L;
 
        /* Notification for change in SystemParametersInfo() */
     case WM_SETTINGCHANGE:
@@ -987,13 +990,19 @@ _WndProc(
            case TCN_SELCHANGE:
                if (gui_mch_showing_tabline()
                                  && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
+               {
                    send_tabline_event(TabCtrl_GetCurSel(s_tabhwnd) + 1);
+                   return 0L;
+               }
                break;
 
            case NM_RCLICK:
                if (gui_mch_showing_tabline()
                        && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd)
+               {
                    show_tabline_popup_menu();
+                   return 0L;
+               }
                break;
 # endif
            default:
@@ -1037,6 +1046,7 @@ _WndProc(
                out_flush();
                did_menu_tip = TRUE;
            }
+           return 0L;
        }
        break;
 #endif
@@ -1079,18 +1089,19 @@ _WndProc(
     case WM_IME_NOTIFY:
        if (!_OnImeNotify(hwnd, (DWORD)wParam, (DWORD)lParam))
            return MyWindowProc(hwnd, uMsg, wParam, lParam);
-       break;
+       return 1L;
+
     case WM_IME_COMPOSITION:
        if (!_OnImeComposition(hwnd, wParam, lParam))
            return MyWindowProc(hwnd, uMsg, wParam, lParam);
-       break;
+       return 1L;
 #endif
 
     default:
        if (uMsg == msh_msgmousewheel && msh_msgmousewheel != 0)
        {   /* handle MSH_MOUSEWHEEL messages for Intellimouse */
            _OnMouseWheel(hwnd, HIWORD(wParam));
-           break;
+           return 0L;
        }
 #ifdef MSWIN_FIND_REPLACE
        else if (uMsg == s_findrep_msg && s_findrep_msg != 0)
index 6ee8427c19da65edaaffbc724cc392298b90929e..8f7ff0347b1adf7687e2bdd2b6d7921327bd6a82 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    382,
 /**/
     381,
 /**/