aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-07-31 13:13:14 +0300
committerZyX <kp-pav@yandex.ru>2017-07-31 13:13:14 +0300
commita356d3c89567dc13c5de70d33e5bcc534bf4c6cb (patch)
tree7e0b7c3902641378056e9c21abb6a1122d2c5dd7 /runtime/doc/vim_diff.txt
parentfbe60af538aa6c723779ae7a816de845460619ae (diff)
parent27356de2697ca542ded05ea6c2017a3ca738084f (diff)
downloadrneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.gz
rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.bz2
rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.zip
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt7
1 files changed, 2 insertions, 5 deletions
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