From eea804ab59637f555e5608f93ebf24a0bca0a432 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Sat, 21 Mar 2015 00:09:42 -0400 Subject: Remove *_BUILTIN_TCAPS & 'ttybuiltin' 'ttybuiltin' was removed and *_BUILTIN_TCAPS was made into dead code in PR #1820. --- runtime/doc/eval.txt | 2 -- runtime/doc/options.txt | 13 +------------ runtime/doc/quickref.txt | 1 - runtime/doc/term.txt | 29 ----------------------------- runtime/doc/various.txt | 2 -- runtime/syntax/vim.vim | 8 ++++---- src/nvim/eval.c | 6 ------ src/nvim/version.c | 9 --------- 8 files changed, 5 insertions(+), 65 deletions(-) diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 3c789e1155..1d18a61dbd 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6654,7 +6654,6 @@ There are four types of features: included. acl Compiled with |ACL| support. -all_builtin_terms Compiled with all builtin terminals enabled. arabic Compiled with Arabic support |Arabic|. autocmd Compiled with autocommand support. |autocommand| balloon_eval Compiled with |balloon-eval| support. @@ -6662,7 +6661,6 @@ balloon_multiline GUI supports multiline balloons. browse Compiled with |:browse| support, and browse() will work. browsefilter Compiled with support for |browsefilter|. -builtin_terms Compiled with some builtin terminals. byte_offset Compiled with support for 'o' in 'statusline' cindent Compiled with 'cindent' support. clientserver Compiled with remote invocation support |clientserver|. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 2967036155..545a9dc828 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -7153,18 +7153,7 @@ A jump table for the options with a short description can be found at |Q_op|. by user preferences or the current theme is used. *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'* -'ttybuiltin' 'tbi' boolean (default on) - global - {not in Vi} - When on, the builtin termcaps are searched before the external ones. - When off the builtin termcaps are searched after the external ones. - When this option is changed, you should set the 'term' option next for - the change to take effect, for example: > - :set notbi term=$TERM -< See also |termcap|. - Rationale: The default for this option is "on", because the builtin - termcap entries are generally better (many systems contain faulty - xterm entries...). +'ttybuiltin' 'tbi' Removed. {Nvim} *'ttyfast'* *'tf'* *'nottyfast'* *'notf'* 'ttyfast' 'tf' Removed. {Nvim} diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 5d251e7b68..68a8e878a2 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -909,7 +909,6 @@ Short explanation of each option: *option-list* 'toolbariconsize' 'tbis' size of the toolbar icons (for GTK 2 only) 'ttimeout' time out on mappings 'ttimeoutlen' 'ttm' time out time for key codes in milliseconds -'ttybuiltin' 'tbi' use built-in termcap before external termcap 'ttymouse' 'ttym' type of mouse codes generated 'ttyscroll' 'tsl' maximum number of lines for a scroll 'ttytype' 'tty' alias for 'term' diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 49eb429319..f37ba9b256 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -38,35 +38,6 @@ the choice whether to use terminfo or termcap is done automatically. When running Vim the output of ":version" will show |+terminfo| if terminfo is used. Also see |xterm-screens|. -On non-Unix systems a termcap is only available if Vim was compiled with -TERMCAP defined. - - *builtin-terms* *builtin_terms* -Which builtin terminals are available depends on a few defines in feature.h, -which need to be set at compile time: - define output of ":version" terminals builtin ~ -NO_BUILTIN_TCAPS -builtin_terms none -SOME_BUILTIN_TCAPS +builtin_terms most common ones (default) -ALL_BUILTIN_TCAPS ++builtin_terms all available - -You can see a list of available builtin terminals with ":set term=xxx" (when -not running the GUI). Also see |+builtin_terms|. - -If the termcap code is included Vim will try to get the strings for the -terminal you are using from the termcap file and the builtin termcaps. Both -are always used, if an entry for the terminal you are using is present. Which -one is used first depends on the 'ttybuiltin' option: - -'ttybuiltin' on 1: builtin termcap 2: external termcap -'ttybuiltin' off 1: external termcap 2: builtin termcap - -If an option is missing in one of them, it will be obtained from the other -one. If an option is present in both, the one first encountered is used. - -Which external termcap file is used varies from system to system and may -depend on the environment variables "TERMCAP" and "TERMPATH". See "man -tgetent". - Settings depending on terminal *term-dependent-settings* If you want to set options or mappings, depending on the terminal name, you diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index ced0c24434..c8dc331361 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -306,8 +306,6 @@ m *+balloon_eval* |balloon-eval| support. Included when compiling with supported GUI (Motif, GTK, GUI) and either Netbeans/Sun Workshop integration or |+eval| feature. N *+browse* |:browse| command -N *+builtin_terms* some terminals builtin |builtin-terms| -B *++builtin_terms* maximal terminals builtin |builtin-terms| N *+byte_offset* support for 'o' flag in 'statusline' option, "go" and ":goto" commands. N *+cindent* |'cindent'|, C indenting diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index c5aacec565..8ad6b2819f 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -27,21 +27,21 @@ syn match vimCommand contained "\