aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-08-02 09:24:24 +0800
committerckelsel <ckelsel@hotmail.com>2017-08-02 09:24:24 +0800
commitb16a4ad49a010a8a2f1019394396fee5facbbd16 (patch)
tree8ac26ac0549434c20acb12ca6e939c555b710069 /runtime/doc/vim_diff.txt
parent7c7039767aa4d715aea997721b0d759b308a43d4 (diff)
parent27356de2697ca542ded05ea6c2017a3ca738084f (diff)
downloadrneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.tar.gz
rneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.tar.bz2
rneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.zip
Merge remote-tracking branch 'upstream/master'
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 23d597e333..1f94a45c74 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -299,13 +299,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