diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-31 19:07:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-31 19:07:19 +0100 |
| commit | e7fedb6ebe72d9a475aa65109b77d5ed4667067a (patch) | |
| tree | 19327fc9d1ca538d9c5c81c7284adf492e790e6d /src/misc1.c | |
| parent | e3303cb0817e826e3c25d5dc4ac10b569d0841e1 (diff) | |
| download | vim-e7fedb6ebe72d9a475aa65109b77d5ed4667067a.zip | |
patch 7.4.1008
Problem: The OS/2 code pollutes the source while nobody uses it these days.
Solution: Drop the support for OS/2.
Diffstat (limited to 'src/misc1.c')
| -rw-r--r-- | src/misc1.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/misc1.c b/src/misc1.c index 5190db4a1..d1e762c9a 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3856,7 +3856,7 @@ init_homedir() # endif #endif -#if defined(OS2) || defined(MSDOS) || defined(MSWIN) +#if defined(MSDOS) || defined(MSWIN) /* * Default home dir is C:/ * Best assumption we can make in such a situation. @@ -3995,7 +3995,7 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr) && at_start #endif ) -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) +#if defined(MSDOS) || defined(MSWIN) || *src == '%' #endif || (*src == '~' && at_start)) @@ -4024,21 +4024,16 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr) #endif { while (c-- > 0 && *tail != NUL && ((vim_isIDc(*tail)) -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) +#if defined(MSDOS) || defined(MSWIN) || (*src == '%' && *tail != '%') #endif )) { -#ifdef OS2 /* env vars only in uppercase */ - *var++ = TOUPPER_LOC(*tail); - tail++; /* toupper() may be a macro! */ -#else *var++ = *tail++; -#endif } } -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) || defined(UNIX) +#if defined(MSDOS) || defined(MSWIN) || defined(UNIX) # ifdef UNIX if (src[1] == '{' && *tail != '}') # else @@ -4056,7 +4051,7 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr) #endif *var = NUL; var = vim_getenv(dst, &mustfree); -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) || defined(UNIX) +#if defined(MSDOS) || defined(MSWIN) || defined(UNIX) } #endif } @@ -4249,7 +4244,7 @@ vim_getenv(name, mustfree) char_u *pend; int vimruntime; -#if defined(OS2) || defined(MSDOS) || defined(MSWIN) +#if defined(MSDOS) || defined(MSWIN) /* use "C:/" when $HOME is not set */ if (STRCMP(name, "HOME") == 0) return homedir; @@ -5000,7 +4995,7 @@ get_past_head(path) { char_u *retval; -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) +#if defined(MSDOS) || defined(MSWIN) /* may skip "c:" */ if (isalpha(path[0]) && path[1] == ':') retval = path + 2; @@ -10882,7 +10877,7 @@ has_env_var(p) if (*p == '\\' && p[1] != NUL) ++p; else if (vim_strchr((char_u *) -#if defined(MSDOS) || defined(MSWIN) || defined(OS2) +#if defined(MSDOS) || defined(MSWIN) "$%" #else "$" |