updated for version 7.1-196

diff --git a/src/gui_w32.c b/src/gui_w32.c
index bcc1524a95637fdd155a29cfce3549e653ab2b52..aad613c7bddeada544ab25cd2c983be6ec34ede8 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -987,6 +987,11 @@ _WndProc(
                        {
                            LPNMTTDISPINFOW     lpdi = (LPNMTTDISPINFOW)lParam;
 
+                           /* Set the maximum width, this also enables using
+                            * \n for line break. */
+                           SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+                                                                     0, 500);
+
                            tt_text = enc_to_ucs2(str, NULL);
                            lpdi->lpszText = tt_text;
                            /* can't show tooltip if failed */
@@ -996,6 +1001,11 @@ _WndProc(
                        {
                            LPNMTTDISPINFO      lpdi = (LPNMTTDISPINFO)lParam;
 
+                           /* Set the maximum width, this also enables using
+                            * \n for line break. */
+                           SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+                                                                     0, 500);
+
                            if (STRLEN(str) < sizeof(lpdi->szText)
                                    || ((tt_text = vim_strsave(str)) == NULL))
                                vim_strncpy(lpdi->szText, str,
@@ -4734,12 +4744,12 @@ Handle_WM_Notify(hwnd, pnmh)
            cur_beval->showState = ShS_NEUTRAL;
            break;
        case TTN_GETDISPINFO:
-       {
-           /* if you get there then we have new common controls */
-           NMTTDISPINFO_NEW *info = (NMTTDISPINFO_NEW *)pnmh;
-           info->lpszText = (LPSTR)info->lParam;
-           info->uFlags |= TTF_DI_SETITEM;
-       }
+           {
+               /* if you get there then we have new common controls */
+               NMTTDISPINFO_NEW *info = (NMTTDISPINFO_NEW *)pnmh;
+               info->lpszText = (LPSTR)info->lParam;
+               info->uFlags |= TTF_DI_SETITEM;
+           }
            break;
        }
     }

diff --git a/src/version.c b/src/version.c
index d60f52d02d70d8efeb5d0b4008f3738e97dc9314..5846a406f7618f8985987ade2e9e22413af6bf63 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    196,
 /**/
     195,
 /**/