patch 7.4.1399
Problem: The MS-DOS code does not build.
Solution: Remove the old MS-DOS code.
diff --git a/src/misc1.c b/src/misc1.c
index cb45a72..27ca83e 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3676,28 +3676,9 @@
&& !(gui.in_use && gui.starting)
#endif
)
- {
out_str(T_VB);
- }
else
- {
-#ifdef MSDOS
- /*
- * The number of beeps outputted is reduced to avoid having to
- * wait for all the beeps to finish. This is only a problem on
- * systems where the beeps don't overlap.
- */
- if (beep_count == 0 || beep_count == 10)
- {
- out_char(BELL);
- beep_count = 1;
- }
- else
- ++beep_count;
-#else
out_char(BELL);
-#endif
- }
}
/* When 'verbose' is set and we are sourcing a script or executing a
@@ -3811,7 +3792,7 @@
# endif
#endif
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
/*
* Default home dir is C:/
* Best assumption we can make in such a situation.
@@ -3947,7 +3928,7 @@
&& at_start
#endif
)
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
|| *src == '%'
#endif
|| (*src == '~' && at_start))
@@ -3976,7 +3957,7 @@
#endif
{
while (c-- > 0 && *tail != NUL && ((vim_isIDc(*tail))
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
|| (*src == '%' && *tail != '%')
#endif
))
@@ -3985,7 +3966,7 @@
}
}
-#if defined(MSDOS) || defined(MSWIN) || defined(UNIX)
+#if defined(MSWIN) || defined(UNIX)
# ifdef UNIX
if (src[1] == '{' && *tail != '}')
# else
@@ -4003,7 +3984,7 @@
#endif
*var = NUL;
var = vim_getenv(dst, &mustfree);
-#if defined(MSDOS) || defined(MSWIN) || defined(UNIX)
+#if defined(MSWIN) || defined(UNIX)
}
#endif
}
@@ -4194,7 +4175,7 @@
char_u *pend;
int vimruntime;
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
/* use "C:/" when $HOME is not set */
if (STRCMP(name, "HOME") == 0)
return homedir;
@@ -4932,7 +4913,7 @@
{
char_u *retval;
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
/* may skip "c:" */
if (isalpha(path[0]) && path[1] == ':')
retval = path + 2;
@@ -9734,13 +9715,13 @@
static int expand_backtick(garray_T *gap, char_u *pat, int flags);
# endif
-# if defined(MSDOS) || defined(WIN3264)
+# if defined(WIN3264)
/*
* File name expansion code for MS-DOS, Win16 and Win32. It's here because
* it's shared between these systems.
*/
-# if defined(DJGPP) || defined(PROTO)
-# define _cdecl /* DJGPP doesn't have this */
+# if defined(PROTO)
+# define _cdecl
# else
# ifdef __BORLANDC__
# define _cdecl _RTLENTRYF
@@ -9762,14 +9743,8 @@
char_u *d,
char_u *s)
{
-# ifdef DJGPP
- if (USE_LONG_FNAME) /* don't lower case on Windows 95/NT systems */
- while (*s)
- *d++ = *s++;
- else
-# endif
- while (*s)
- *d++ = TOLOWER_LOC(*s++);
+ while (*s)
+ *d++ = TOLOWER_LOC(*s++);
*d = NUL;
}
# endif
@@ -10078,7 +10053,7 @@
{
return dos_expandpath(gap, path, 0, flags, FALSE);
}
-# endif /* MSDOS || WIN3264 */
+# endif /* WIN3264 */
#if (defined(UNIX) && !defined(VMS)) || defined(USE_UNIXFILENAME) \
|| defined(PROTO)
@@ -10444,7 +10419,7 @@
if (ga_grow(gap, 1) == FAIL)
break;
-# if defined(MSWIN) || defined(MSDOS)
+# if defined(MSWIN)
/* Avoid the path ending in a backslash, it fails when a comma is
* appended. */
len = (int)STRLEN(buf);
@@ -10482,7 +10457,7 @@
int j = 0;
while ((fname[j] == path_part[i][j]
-# if defined(MSWIN) || defined(MSDOS)
+# if defined(MSWIN)
|| (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j]))
#endif
) && fname[j] != NUL && path_part[i][j] != NUL)
@@ -10603,7 +10578,7 @@
*/
short_name = shorten_fname(path, curdir);
if (short_name != NULL && short_name > path + 1
-#if defined(MSWIN) || defined(MSDOS)
+#if defined(MSWIN)
/* On windows,
* shorten_fname("c:\a\a.txt", "c:\a\b")
* returns "\a\a.txt", which is not really the short
@@ -10743,7 +10718,7 @@
if (*p == '\\' && p[1] != NUL)
++p;
else if (vim_strchr((char_u *)
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSWIN)
"$%"
#else
"$"