summaryrefslogtreecommitdiff
path: root/src/version.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-10-12 14:20:24 +0200
committerBram Moolenaar <Bram@vim.org>2016-10-12 14:20:24 +0200
commitcea912af725c54f4727a0565e31661f6b29c6bb1 (patch)
treef48da16d68c229e22ff83fa31cc7337368875e3d /src/version.c
parenta7c023ec88233a2db4c1f53121921e110ece8d43 (diff)
downloadvim-git-cea912af725c54f4727a0565e31661f6b29c6bb1.tar.gz
patch 8.0.0029v8.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)
Diffstat (limited to 'src/version.c')
-rw-r--r--src/version.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/src/version.c b/src/version.c
index a6f4c136f..b6bad041b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 29,
+/**/
28,
/**/
27,
@@ -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. */