diff options
| -rw-r--r-- | runtime/doc/editing.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 14 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 8 |
5 files changed, 5 insertions, 20 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 0b5f69a7b7..f2f2bee79e 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -500,7 +500,6 @@ The 'fileformat' option sets the <EOL> style for a file: "dos" <CR><NL> or <NL> DOS format *DOS-format* "unix" <NL> Unix format *Unix-format* "mac" <CR> Mac format *Mac-format* -Previously 'textmode' was used. It is obsolete now. When reading a file, the mentioned characters are interpreted as the <EOL>. In DOS format (default for MS-DOS, OS/2 and Win32), <CR><NL> and <NL> are both diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 4136c91898..ce92f14f81 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1925,7 +1925,6 @@ The 'fileformat' option sets the <EOL> style for a file: "dos" <CR><NL> or <NL> DOS format "unix" <NL> Unix format "mac" <CR> Mac format -Previously 'textmode' was used. It is obsolete now. If 'fileformat' is "dos", a <CR> in front of an <NL> is ignored and a CTRL-Z at the end of the file is ignored. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 5fce90036b..0f641bc309 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1727,7 +1727,7 @@ 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 textmode detection + 'textauto' + off no automatic fileformats detection 'textwidth' 0 no automatic line wrap 'tildeop' off tilde is not an operator 'ttimeout' off no terminal timeout @@ -2915,8 +2915,6 @@ A jump table for the options with a short description can be found at |Q_op|. When this option is set, after starting to edit a file, the 'modified' option is set, because the file would be different when written. This option can not be changed when 'modifiable' is off. - For backwards compatibility: When this option is set to "dos", - 'textmode' is set, otherwise 'textmode' is reset. *'fileformats'* *'ffs'* 'fileformats' 'ffs' string (default: @@ -7261,16 +7259,6 @@ A jump table for the options with a short description can be found at |Q_op|. NOTE: This option is set to the Vi default value when 'compatible' is set and to the Vim default value when 'compatible' is reset. - *'textmode'* *'tx'* *'notextmode'* *'notx'* -'textmode' 'tx' boolean (MS-DOS, Win32 and OS/2: default on, - others: default off) - local to buffer - {not in Vi} - This option is obsolete. Use 'fileformat'. - For backwards compatibility, when 'textmode' is set, 'fileformat' is - set to "dos". When 'textmode' is reset, 'fileformat' is set to - "unix". - *'textwidth'* *'tw'* 'textwidth' 'tw' number (default 0) local to buffer diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 79d87fa915..3cfeebc07d 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -904,7 +904,6 @@ Short explanation of each option: *option-list* 'termencoding' 'tenc' character encoding used by the terminal 'terse' shorten some messages 'textauto' 'ta' obsolete, use 'fileformats' -'textmode' 'tx' obsolete, use 'fileformat' '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/doc/starting.txt b/runtime/doc/starting.txt index 773a3b9125..a650670cf1 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1157,10 +1157,10 @@ vimrc file. These commands will write ":map" and ":set" commands to a file, in such a way that when these commands are executed, the current key mappings and options will be set to the same values. The options 'columns', 'endofline', -'fileformat', 'key', 'lines', 'modified', 'scroll', 'term', 'textmode', -'ttyfast' and 'ttymouse' are not included, because these are terminal or file -dependent. Note that the options 'binary', 'paste' and 'readonly' are -included, this might not always be what you want. +'fileformat', 'key', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and +'ttymouse' are not included, because these are terminal or file dependent. +Note that the options 'binary', 'paste' and 'readonly' are included, this +might not always be what you want. When special keys are used in mappings, The 'cpoptions' option will be temporarily set to its Vim default, to avoid the mappings to be |