updated for version 7.4.479

Problem:    MS-Windows: The console title can be wrong.
Solution:   Take the encoding into account. When restoring the title use the
            right function. (Yasuhiro Matsumoto)

diff --git a/src/os_mswin.c b/src/os_mswin.c
index dff0939764036e0ab461ea9ddb21d6bf771aaa30..dfd40af8de89fa61679c72e02ee7d98ed004a0a3 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -344,7 +344,7 @@ mch_restore_title(
     int which)
 {
 #ifndef FEAT_GUI_MSWIN
-    mch_settitle((which & 1) ? g_szOrigTitle : NULL, NULL);
+    SetConsoleTitle(g_szOrigTitle);
 #endif
 }
 

diff --git a/src/os_win32.c b/src/os_win32.c
index eb66ed2d2bd0cb2a9648fc9354ddb5e9ceb6c40b..a831ada54ca9170ce06d93b24f1e5b93538af22f 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4648,6 +4648,35 @@ mch_call_shell(
 #ifdef FEAT_TITLE
     char szShellTitle[512];
 
+# ifdef FEAT_MBYTE
+    /* Change the title to reflect that we are in a subshell. */
+    if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+    {
+       WCHAR szShellTitle[512];
+
+       if (GetConsoleTitleW(szShellTitle,
+                                 sizeof(szShellTitle)/sizeof(WCHAR) - 4) > 0)
+       {
+           if (cmd == NULL)
+               wcscat(szShellTitle, L" :sh");
+           else
+           {
+               WCHAR *wn = enc_to_utf16(cmd, NULL);
+
+               if (wn != NULL)
+               {
+                   wcscat(szShellTitle, L" - !");
+                   if ((wcslen(szShellTitle) + wcslen(wn) <
+                                         sizeof(szShellTitle)/sizeof(WCHAR)))
+                       wcscat(szShellTitle, wn);
+                   SetConsoleTitleW(szShellTitle);
+                   vim_free(wn);
+                   goto didset;
+               }
+           }
+       }
+    }
+#endif
     /* Change the title to reflect that we are in a subshell. */
     if (GetConsoleTitle(szShellTitle, sizeof(szShellTitle) - 4) > 0)
     {
@@ -4659,7 +4688,7 @@ mch_call_shell(
            if ((strlen(szShellTitle) + strlen(cmd) < sizeof(szShellTitle)))
                strcat(szShellTitle, cmd);
        }
-       mch_settitle(szShellTitle, NULL);
+       SetConsoleTitle(szShellTitle);
     }
 #endif
 

diff --git a/src/version.c b/src/version.c
index fed16aa170a052263a47fb15ccb7c3ad8aa831db..3388fafec61dacb154c196f4c6910d77cb96d549 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    479,
 /**/
     478,
 /**/