diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/bugreport.vim | 1 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/term.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 7 |
7 files changed, 8 insertions, 15 deletions
diff --git a/runtime/bugreport.vim b/runtime/bugreport.vim index f0c045e6c3..650e37940d 100644 --- a/runtime/bugreport.vim +++ b/runtime/bugreport.vim @@ -53,7 +53,6 @@ : scriptnames :endif :set all -:set termcap :if has("autocmd") : au :endif diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bc9705d116..6406bfe03b 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -22,9 +22,7 @@ achieve special effects. These options come in three forms: *:se* *:set* :se[t] Show all options that differ from their default value. -:se[t] all Show all but terminal options. - -:se[t] termcap Do nothing. Nvim uses |terminfo|. +:se[t] all Show all options. *E518* *E519* :se[t] {option}? Show value of {option}. diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index bcbf8c365d..c4c3dcad88 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -572,7 +572,6 @@ In Insert or Command-line mode: |:set| :se[t] show all modified options |:set| :se[t] all show all options -|:set| :se[t] termcap Do nothing. (|terminfo|) |:set| :se[t] {option} set boolean option (switch it on), show string or number option |:set| :se[t] no{option} reset boolean option (switch it off) diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 0b72ec9960..91915406cb 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -214,7 +214,7 @@ argument. :set to display option values. When 'verbose' is non-zero messages are printed (for debugging, to stderr). - $TERM (see |TERM|) is not used. + |$TERM| is not used. If Vim appears to be stuck try typing "qa!<Enter>". You don't get a prompt thus you can't see Vim is waiting for you to type something. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index a66f547675..fd17e3b381 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4696,7 +4696,7 @@ cterm={attr-list} *highlight-cterm* ctermfg={color-nr} *highlight-ctermfg* *E421* ctermbg={color-nr} *highlight-ctermbg* The {color-nr} argument is a color number. Its range is zero to - (not including) the number of |terminfo-colors| available. + (not including) the number of |tui-colors| available. The actual color with this number depends on the type of terminal and its settings. Sometimes the color also depends on the settings of "cterm". For example, on some systems "cterm=bold ctermfg=3" gives diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 73c8956085..38900dd826 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -61,7 +61,7 @@ entries for "xterm", "putty", "screen", "tmux", "rxvt", "iterm", "interix", The lookup matches the initial portion of the terminal type, so (for example) "putty-256color" and "putty" will both be mapped to the built-in "putty" entry. The built-in terminfo entries describe the terminal as 256-colour -capable if possible. See |termcap-colors|. +capable if possible. See |tui-colors|. If no built-in terminfo record matches the terminal type, the built-in "ansi" terminfo record is used as a final fallback. @@ -112,7 +112,7 @@ genuine Xterm will not work over an SSH connection, because the environment variable, set by genuine Xterm, that it looks for is not automatically replicated over an SSH login session. - *256-color* *terminfo-colors* *termcap-colors* + *tui-colors* Nvim uses 256 colours by default, ignoring |terminfo| for most terminal types, including "linux" (whose virtual terminals have had 256-colour support since 4.8) and anything claiming to be "xterm". Also when $COLORTERM or $TERM @@ -148,7 +148,7 @@ extension pioneered by dtterm. |terminfo| does not have a flag for this extension. So Nvim simply assumes that (all) "dtterm", "xterm", "teraterm", "rxvt" terminal types, and Konsole, are capable of this. - *tui-cursor-shape* + *tui-cursor-shape* Nvim will adjust the shape of the cursor from a block to a line when in insert mode (or as specified by the 'guicursor' option), on terminals that support it. It uses the same |terminfo| extensions that were pioneered by tmux for diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 9e063b1c04..a33772b9e0 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -309,13 +309,10 @@ example, 'guicursor' sets the terminal cursor style if possible. *'term'* *E529* *E530* *E531* The 'term' option has a fixed value, present only for script compatibility and intentionally not the same as any known terminal type name. It should be a -rare case in Nvim where one needs |term-dependent-settings|, for which use the -|TERM| environment variable. +rare case in Nvim where one needs |term-dependent-settings|. *termcap* -Nvim never uses the termcap database and only uses |terminfo|. See -|builtin-terms| for what happens on operating systems without a terminfo -database. +Nvim never uses the termcap database, only |terminfo| and |builtin-terms|. *xterm-8bit* *xterm-8-bit* Xterm can be run in a mode where it uses true 8-bit CSI. Supporting this |