aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2021-08-19 06:13:08 -0700
committerGitHub <noreply@github.com>2021-08-19 06:13:08 -0700
commit19a0d90bb3479bb6516be229f6001646329d842f (patch)
tree9c4aa1f2c91d71c10cc42e9e3eed04627cc97482 /runtime
parent7bff642169438a66557b65d6aba80536eaf570fa (diff)
parentd8ab8cccd0cf5acdf3e7c3ca229cad4160a6fc2e (diff)
downloadrneovim-19a0d90bb3479bb6516be229f6001646329d842f.tar.gz
rneovim-19a0d90bb3479bb6516be229f6001646329d842f.tar.bz2
rneovim-19a0d90bb3479bb6516be229f6001646329d842f.zip
Merge #15410 defaults: 'hidden', 'nojoinspaces'
ref #6289
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/vim_diff.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c3618328aa..10b849aa3e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3078,7 +3078,7 @@ A jump table for the options with a short description can be found at |Q_op|.
See |help-translated|.
*'hidden'* *'hid'* *'nohidden'* *'nohid'*
-'hidden' 'hid' boolean (default off)
+'hidden' 'hid' boolean (default on)
global
When off a buffer is unloaded when it is |abandon|ed. When on a
buffer becomes hidden when it is |abandon|ed. If the buffer is still
@@ -3498,7 +3498,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|jumplist-stack|
*'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'*
-'joinspaces' 'js' boolean (default on)
+'joinspaces' 'js' boolean (default off)
global
Insert two spaces after a '.', '?' and '!' with a join command.
Otherwise only one space is inserted.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7e1bd3e087..8487e1b0df 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -41,9 +41,11 @@ the differences.
- 'fillchars' defaults (in effect) to "vert:│,fold:·,sep:│"
- 'formatoptions' defaults to "tcqj"
- 'fsync' is disabled
+- 'hidden' is enabled
- 'history' defaults to 10000 (the maximum)
- 'hlsearch' is enabled
- 'incsearch' is enabled
+- 'joinspaces' is disabled
- 'langnoremap' is enabled
- 'langremap' is disabled
- 'laststatus' defaults to 2 (statusline is always shown)