|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.480
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.480 (after 7.4.479)
|
|
|
d6ba96 |
Problem: MS-Windows: Can't build.
|
|
|
d6ba96 |
Solution: Remove goto, use a flag instead.
|
|
|
d6ba96 |
Files: src/os_win32.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.479/src/os_win32.c 2014-10-15 22:50:06.946093724 +0200
|
|
|
d6ba96 |
--- src/os_win32.c 2014-10-16 16:09:57.182230006 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 4646,4654 ****
|
|
|
d6ba96 |
int x = 0;
|
|
|
d6ba96 |
int tmode = cur_tmode;
|
|
|
d6ba96 |
#ifdef FEAT_TITLE
|
|
|
d6ba96 |
! char szShellTitle[512];
|
|
|
d6ba96 |
!
|
|
|
d6ba96 |
# ifdef FEAT_MBYTE
|
|
|
d6ba96 |
/* Change the title to reflect that we are in a subshell. */
|
|
|
d6ba96 |
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
--- 4646,4655 ----
|
|
|
d6ba96 |
int x = 0;
|
|
|
d6ba96 |
int tmode = cur_tmode;
|
|
|
d6ba96 |
#ifdef FEAT_TITLE
|
|
|
d6ba96 |
! char szShellTitle[512];
|
|
|
d6ba96 |
# ifdef FEAT_MBYTE
|
|
|
d6ba96 |
+ int did_set_title = FALSE;
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
/* Change the title to reflect that we are in a subshell. */
|
|
|
d6ba96 |
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 4671,4695 ****
|
|
|
d6ba96 |
wcscat(szShellTitle, wn);
|
|
|
d6ba96 |
SetConsoleTitleW(szShellTitle);
|
|
|
d6ba96 |
vim_free(wn);
|
|
|
d6ba96 |
! goto didset;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! #endif
|
|
|
d6ba96 |
! /* Change the title to reflect that we are in a subshell. */
|
|
|
d6ba96 |
! if (GetConsoleTitle(szShellTitle, sizeof(szShellTitle) - 4) > 0)
|
|
|
d6ba96 |
! {
|
|
|
d6ba96 |
! if (cmd == NULL)
|
|
|
d6ba96 |
! strcat(szShellTitle, " :sh");
|
|
|
d6ba96 |
! else
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
! strcat(szShellTitle, " - !");
|
|
|
d6ba96 |
! if ((strlen(szShellTitle) + strlen(cmd) < sizeof(szShellTitle)))
|
|
|
d6ba96 |
! strcat(szShellTitle, cmd);
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
- SetConsoleTitle(szShellTitle);
|
|
|
d6ba96 |
- }
|
|
|
d6ba96 |
#endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
out_flush();
|
|
|
d6ba96 |
--- 4672,4697 ----
|
|
|
d6ba96 |
wcscat(szShellTitle, wn);
|
|
|
d6ba96 |
SetConsoleTitleW(szShellTitle);
|
|
|
d6ba96 |
vim_free(wn);
|
|
|
d6ba96 |
! did_set_title = TRUE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! if (!did_set_title)
|
|
|
d6ba96 |
! # endif
|
|
|
d6ba96 |
! /* Change the title to reflect that we are in a subshell. */
|
|
|
d6ba96 |
! if (GetConsoleTitle(szShellTitle, sizeof(szShellTitle) - 4) > 0)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
! if (cmd == NULL)
|
|
|
d6ba96 |
! strcat(szShellTitle, " :sh");
|
|
|
d6ba96 |
! else
|
|
|
d6ba96 |
! {
|
|
|
d6ba96 |
! strcat(szShellTitle, " - !");
|
|
|
d6ba96 |
! if ((strlen(szShellTitle) + strlen(cmd) < sizeof(szShellTitle)))
|
|
|
d6ba96 |
! strcat(szShellTitle, cmd);
|
|
|
d6ba96 |
! }
|
|
|
d6ba96 |
! SetConsoleTitle(szShellTitle);
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
#endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
out_flush();
|
|
|
d6ba96 |
*** ../vim-7.4.479/src/version.c 2014-10-15 22:50:06.950093724 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-10-16 16:11:34.278230218 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 743,744 ****
|
|
|
d6ba96 |
--- 743,746 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 480,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
Ten bugs in the hand is better than one as yet undetected.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|