diff options
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c index 0c6178d63..ffeaf8644 100644 --- a/src/option.c +++ b/src/option.c @@ -2593,18 +2593,19 @@ set_init_1() /* * Find default value for 'shell' option. + * Don't use it if it is empty. */ - if ((p = mch_getenv((char_u *)"SHELL")) != NULL + if (((p = mch_getenv((char_u *)"SHELL")) != NULL && *p != NUL) #if defined(MSDOS) || defined(MSWIN) || defined(OS2) # ifdef __EMX__ - || (p = mch_getenv((char_u *)"EMXSHELL")) != NULL + || ((p = mch_getenv((char_u *)"EMXSHELL")) != NULL && *p != NUL) # endif - || (p = mch_getenv((char_u *)"COMSPEC")) != NULL + || ((p = mch_getenv((char_u *)"COMSPEC")) != NULL && *p != NUL) # ifdef WIN3264 - || (p = default_shell()) != NULL + || ((p = default_shell()) != NULL && *p != NUL) # endif #endif - ) + ) set_string_default("sh", p); #ifdef FEAT_WILDIGN |