summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/option.c b/src/option.c
index fbf07600e..288c01bba 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2004,11 +2004,7 @@ static struct vimoption options[] =
#if defined(AMIGA) || defined(MSWIN)
(char_u *)".,,",
#else
-# if defined(__EMX__)
- (char_u *)".,/emx/include,,",
-# else /* Unix, probably */
(char_u *)".,/usr/include,,",
-# endif
#endif
(char_u *)0L} SCRIPTID_INIT},
#if defined(DYNAMIC_PERL)
@@ -2344,7 +2340,7 @@ static struct vimoption options[] =
{"shellxquote", "sxq", P_STRING|P_VI_DEF|P_SECURE,
(char_u *)&p_sxq, PV_NONE,
{
-#if defined(UNIX) && defined(USE_SYSTEM) && !defined(__EMX__)
+#if defined(UNIX) && defined(USE_SYSTEM)
(char_u *)"\"",
#else
(char_u *)"",
@@ -3184,9 +3180,6 @@ set_init_1(void)
*/
if (((p = mch_getenv((char_u *)"SHELL")) != NULL && *p != NUL)
#if defined(MSWIN)
-# ifdef __EMX__
- || ((p = mch_getenv((char_u *)"EMXSHELL")) != NULL && *p != NUL)
-# endif
|| ((p = mch_getenv((char_u *)"COMSPEC")) != NULL && *p != NUL)
# ifdef WIN3264
|| ((p = (char_u *)default_shell()) != NULL && *p != NUL)