diff options
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/option.c b/src/option.c index f3c53b228..05e0527cd 100644 --- a/src/option.c +++ b/src/option.c @@ -220,7 +220,6 @@ set_init_1(int clean_arg) } } -#ifdef FEAT_SEARCHPATH { char_u *cdpath; char_u *buf; @@ -262,7 +261,6 @@ set_init_1(int clean_arg) vim_free(cdpath); } } -#endif #if defined(FEAT_POSTSCRIPT) && \ (defined(MSWIN) || defined(VMS) || defined(MAC) || defined(hpux)) @@ -5519,9 +5517,7 @@ get_varp(struct vimoption *p) case PV_SI: return (char_u *)&(curbuf->b_p_si); case PV_SN: return (char_u *)&(curbuf->b_p_sn); case PV_STS: return (char_u *)&(curbuf->b_p_sts); -#ifdef FEAT_SEARCHPATH case PV_SUA: return (char_u *)&(curbuf->b_p_sua); -#endif case PV_SWF: return (char_u *)&(curbuf->b_p_swf); #ifdef FEAT_SYN_HL case PV_SMC: return (char_u *)&(curbuf->b_p_smc); @@ -6080,10 +6076,8 @@ buf_copy_options(buf_T *buf, int flags) buf->b_p_key = vim_strsave(p_key); COPY_OPT_SCTX(buf, BV_KEY); #endif -#ifdef FEAT_SEARCHPATH buf->b_p_sua = vim_strsave(p_sua); COPY_OPT_SCTX(buf, BV_SUA); -#endif #ifdef FEAT_KEYMAP buf->b_p_keymap = vim_strsave(p_keymap); COPY_OPT_SCTX(buf, BV_KMAP); @@ -6380,20 +6374,14 @@ set_context_in_set_cmd( || p == (char_u *)&p_path || p == (char_u *)&p_pp || p == (char_u *)&p_rtp -#ifdef FEAT_SEARCHPATH || p == (char_u *)&p_cdpath -#endif #ifdef FEAT_SESSION || p == (char_u *)&p_vdir #endif ) { xp->xp_context = EXPAND_DIRECTORIES; - if (p == (char_u *)&p_path -#ifdef FEAT_SEARCHPATH - || p == (char_u *)&p_cdpath -#endif - ) + if (p == (char_u *)&p_path || p == (char_u *)&p_cdpath) xp->xp_backslash = XP_BS_THREE; else xp->xp_backslash = XP_BS_ONE; |