aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt29
1 files changed, 15 insertions, 14 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index fd71067542..a5ef55b8f2 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -26,13 +26,14 @@ the differences.
- Syntax highlighting is enabled by default
- ":filetype plugin indent on" is enabled by default
-- 'autoindent' is set by default
-- 'autoread' is set by default
-- 'background' always defaults to "dark"
+- 'autoindent' is enabled
+- 'autoread' is enabled
+- 'background' defaults to "dark" (unless set automatically by the terminal/UI)
- 'backspace' defaults to "indent,eol,start"
- 'backupdir' defaults to .,~/.local/share/nvim/backup (|xdg|)
- 'belloff' defaults to "all"
-- 'complete' doesn't include "i"
+- 'compatible' is always disabled
+- 'complete' excludes "i"
- 'cscopeverbose' is enabled
- 'directory' defaults to ~/.local/share/nvim/swap// (|xdg|), auto-created
- 'display' defaults to "lastline,msgsep"
@@ -41,27 +42,27 @@ the differences.
- 'formatoptions' defaults to "tcqj"
- 'fsync' is disabled
- 'history' defaults to 10000 (the maximum)
-- 'hlsearch' is set by default
-- 'incsearch' is set by default
-- 'langnoremap' is enabled by default
-- 'langremap' is disabled by default
+- 'hlsearch' is enabled
+- 'incsearch' is enabled
+- 'langnoremap' is enabled
+- 'langremap' is disabled
- 'laststatus' defaults to 2 (statusline is always shown)
- 'listchars' defaults to "tab:> ,trail:-,nbsp:+"
-- 'nocompatible' is always set
- 'nrformats' defaults to "bin,hex"
-- 'ruler' is set by default
-- 'sessionoptions' doesn't include "options"
+- 'ruler' is enabled
+- 'sessionoptions' excludes "options"
- 'shortmess' includes "F", excludes "S"
-- 'showcmd' is set by default
+- 'showcmd' is enabled
- 'sidescroll' defaults to 1
-- 'smarttab' is set by default
+- 'smarttab' is enabled
- 'tabpagemax' defaults to 50
- 'tags' defaults to "./tags;,tags"
- 'ttimeoutlen' defaults to 50
- 'ttyfast' is always set
- 'undodir' defaults to ~/.local/share/nvim/undo (|xdg|), auto-created
- 'viminfo' includes "!"
-- 'wildmenu' is set by default
+- 'wildmenu' is enabled
+- 'wildoptions' defaults to "pum,tagfile"
==============================================================================
3. New Features *nvim-features*