diff options
| -rw-r--r-- | src/option.c | 22 | ||||
| -rw-r--r-- | src/option_defs.h | 4 |
2 files changed, 3 insertions, 23 deletions
diff --git a/src/option.c b/src/option.c index aee02fa5c0..17428ac697 100644 --- a/src/option.c +++ b/src/option.c @@ -1581,10 +1581,6 @@ static struct vimoption {"terse", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_terse, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"textauto", "ta", P_BOOL|P_VIM, - (char_u *)&p_ta, PV_NONE, - {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE} - SCRIPTID_INIT}, {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF, (char_u *)&p_tw, PV_TW, {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, @@ -4156,14 +4152,8 @@ did_set_string_option ( } /* 'fileformats' */ else if (varp == &p_ffs) { - if (check_opt_strings(p_ffs, p_ff_values, TRUE) != OK) + if (check_opt_strings(p_ffs, p_ff_values, TRUE) != OK) { errmsg = e_invarg; - else { - /* also change 'textauto' */ - if (*p_ffs == NUL) - p_ta = FALSE; - else - p_ta = TRUE; } } /* 'cryptkey' */ @@ -5249,19 +5239,13 @@ set_bool_option ( if (curwin->w_p_pvw) { win_T *win; - for (win = firstwin; win != NULL; win = win->w_next) + for (win = firstwin; win != NULL; win = win->w_next) { if (win->w_p_pvw && win != curwin) { curwin->w_p_pvw = FALSE; return (char_u *)N_("E590: A preview window already exists"); } + } } - // When 'textauto' is set or reset also change 'fileformats'. - } else if ((int *)varp == &p_ta) { - set_string_option_direct((char_u *)"ffs", - -1, - p_ta ? (char_u *)DFLT_FFS_VIM : (char_u *)"", - OPT_FREE | opt_flags, - 0); } /* diff --git a/src/option_defs.h b/src/option_defs.h index 5179cdf2eb..e89f3e7893 100644 --- a/src/option_defs.h +++ b/src/option_defs.h @@ -26,18 +26,15 @@ # define DFLT_FF "dos" # define DFLT_FFS_VIM "dos,unix" # define DFLT_FFS_VI "dos,unix" /* also autodetect in compatible mode */ -# define DFLT_TEXTAUTO TRUE #else # ifdef USE_CR # define DFLT_FF "mac" # define DFLT_FFS_VIM "mac,unix,dos" # define DFLT_FFS_VI "mac,unix,dos" -# define DFLT_TEXTAUTO TRUE # else # define DFLT_FF "unix" # define DFLT_FFS_VIM "unix,dos" # define DFLT_FFS_VI "" -# define DFLT_TEXTAUTO FALSE # endif #endif @@ -550,7 +547,6 @@ EXTERN int p_tgst; /* 'tagstack' */ EXTERN int p_tbidi; /* 'termbidi' */ EXTERN char_u *p_tenc; /* 'termencoding' */ EXTERN int p_terse; /* 'terse' */ -EXTERN int p_ta; /* 'textauto' */ EXTERN int p_to; /* 'tildeop' */ EXTERN int p_timeout; /* 'timeout' */ EXTERN long p_tm; /* 'timeoutlen' */ |