aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-05-08 15:35:50 -0400
committerMichael Reed <m.reed@mykolab.com>2015-05-08 15:35:50 -0400
commitde58eafd1168cd201f0ee89473eada68296c2f42 (patch)
tree084e9d53a88b393ca3031d0e46f0593ca51b0985 /runtime/doc/vim_diff.txt
parent0d90b5c36c3c17e696792b80f9f4f45778f1cbfd (diff)
parentda2cd84a4d5ce96b72542d19114665af92104c61 (diff)
downloadrneovim-de58eafd1168cd201f0ee89473eada68296c2f42.tar.gz
rneovim-de58eafd1168cd201f0ee89473eada68296c2f42.tar.bz2
rneovim-de58eafd1168cd201f0ee89473eada68296c2f42.zip
Merge pull request #2608 from yagebu/docs-cleanup
[RFC] Docs cleanup: Mark 'macatsui' option as removed, cleanup todo.txt.
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 05de4598c9..215b0edb94 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -110,6 +110,7 @@ MS-DOS support:
'conskey'
Other options:
+ 'macatsui'
'shortname'
'shelltype'
'textauto'
@@ -123,6 +124,9 @@ Other commands:
Other compile-time features:
EBCDIC
+Nvim does not have a built-in GUI and hence the following aliases have been
+removed: gvim, gex, gview, rgvim, rgview
+
"Easy mode" (eview, evim, nvim -y)
"(g)vimdiff" (alias for "(g)nvim -d" |diff-mode|)
"Vi mode" (nvim -v)
@@ -133,13 +137,8 @@ of just using their command line arguments:
ex nvim -e
exim nvim -E
view nvim -R
- gvim nvim -g
- gex nvim -eg
- gview nvim -Rg
rvim nvim -Z
rview nvim -RZ
- rgvim nvim -gZ
- rgview nvim -RgZ
==============================================================================
vim:tw=78:ts=8:noet:ft=help:norl: