0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.0.0029

Problem:    Code for MS-Windows is complicated because of the exceptions for
            old systems.
Solution:   Drop support for MS-Windows older than Windows XP. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-10-12 14:20:24 +02:00
parent a7c023ec88
commit cea912af72
19 changed files with 375 additions and 1298 deletions

View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
29,
/**/
28,
/**/
@@ -962,15 +964,10 @@ list_version(void)
MSG(longVersion);
#ifdef WIN3264
# ifdef FEAT_GUI_W32
# if defined(_MSC_VER) && (_MSC_VER <= 1010)
/* Only MS VC 4.1 and earlier can do Win32s */
MSG_PUTS(_("\nMS-Windows 16/32-bit GUI version"));
# else
# ifdef _WIN64
# ifdef _WIN64
MSG_PUTS(_("\nMS-Windows 64-bit GUI version"));
# else
# else
MSG_PUTS(_("\nMS-Windows 32-bit GUI version"));
# endif
# endif
# ifdef FEAT_OLE
MSG_PUTS(_(" with OLE support"));
@@ -1332,10 +1329,6 @@ intro_message(
blanklines = (int)Rows - ((sizeof(lines) / sizeof(char *)) - 1);
if (!p_cp)
blanklines += 4; /* add 4 for not showing "Vi compatible" message */
#if defined(WIN3264) && !defined(FEAT_GUI_W32)
if (mch_windows95())
blanklines -= 3; /* subtract 3 for showing "Windows 95" message */
#endif
#ifdef FEAT_WINDOWS
/* Don't overwrite a statusline. Depends on 'cmdheight'. */
@@ -1384,17 +1377,6 @@ intro_message(
do_intro_line(row, (char_u *)_(p), i == 2, 0);
++row;
}
#if defined(WIN3264) && !defined(FEAT_GUI_W32)
if (mch_windows95())
{
do_intro_line(++row,
(char_u *)_("WARNING: Windows 95/98/ME detected"),
FALSE, hl_attr(HLF_E));
do_intro_line(++row,
(char_u *)_("type :help windows95<Enter> for info on this"),
FALSE, 0);
}
#endif
}
/* Make the wait-return message appear just below the text. */