aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/options.txt15
-rw-r--r--runtime/doc/quickref.txt1
-rw-r--r--runtime/optwin.vim4
3 files changed, 0 insertions, 20 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0f641bc309..b7b8f28d1a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1727,7 +1727,6 @@ A jump table for the options with a short description can be found at |Q_op|.
'softtabstop' 0 tabs are always 'tabstop' positions
'startofline' on goto startofline with some commands
'tagrelative' + off tag file names are not relative
- 'textauto' + off no automatic fileformats detection
'textwidth' 0 no automatic line wrap
'tildeop' off tilde is not an operator
'ttimeout' off no terminal timeout
@@ -2970,9 +2969,6 @@ A jump table for the options with a short description can be found at |Q_op|.
<CR> in front of it, Dos format is used, otherwise Unix format is
used.
Also see |file-formats|.
- For backwards compatibility: When this option is set to an empty
- string or one format (no comma is included), 'textauto' is reset,
- otherwise 'textauto' is set.
NOTE: This option is set to the Vi default value when 'compatible' is
set and to the Vim default value when 'compatible' is reset.
@@ -7248,17 +7244,6 @@ A jump table for the options with a short description can be found at |Q_op|.
displayed). When reset: Remove 's' flag from 'shortmess' option. {Vi
shortens a lot of messages}
- *'textauto'* *'ta'* *'notextauto'* *'nota'*
-'textauto' 'ta' boolean (Vim default: on, Vi default: off)
- global
- {not in Vi}
- This option is obsolete. Use 'fileformats'.
- For backwards compatibility, when 'textauto' is set, 'fileformats' is
- set to the default value for the current system. When 'textauto' is
- reset, 'fileformats' is made empty.
- NOTE: This option is set to the Vi default value when 'compatible' is
- set and to the Vim default value when 'compatible' is reset.
-
*'textwidth'* *'tw'*
'textwidth' 'tw' number (default 0)
local to buffer
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 3cfeebc07d..98179eecd0 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -903,7 +903,6 @@ Short explanation of each option: *option-list*
'termbidi' 'tbidi' terminal takes care of bi-directionality
'termencoding' 'tenc' character encoding used by the terminal
'terse' shorten some messages
-'textauto' 'ta' obsolete, use 'fileformats'
'textwidth' 'tw' maximum width of text that is being inserted
'thesaurus' 'tsr' list of thesaurus files for keyword completion
'tildeop' 'top' tilde command "~" behaves like an operator
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 0c92f1a791..fdb0cfc801 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -959,11 +959,7 @@ call append("$", "\t(local to buffer)")
call <SID>OptionL("ff")
call append("$", "fileformats\tlist of file formats to look for when editing a file")
call <SID>OptionG("ffs", &ffs)
-call append("$", "textmode\tobsolete, use 'fileformat'")
call append("$", "\t(local to buffer)")
-call <SID>BinOptionL("tx")
-call append("$", "textauto\tobsolete, use 'fileformats'")
-call <SID>BinOptionG("ta", &ta)
call append("$", "write\twriting files is allowed")
call <SID>BinOptionG("write", &write)
call append("$", "writebackup\twrite a backup file before overwriting a file")