aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/vim_diff.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 71c2ba13d3..4477c2e974 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2253,7 +2253,7 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons.
*'display'* *'dy'*
-'display' 'dy' string (default "")
+'display' 'dy' string (default "lastline", Vi default: "")
global
Change the way text is displayed. This is comma separated list of
flags:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 0f32e1ea64..1770781a55 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -32,6 +32,7 @@ these differences.
- 'autoindent' is set by default.
- 'backspace' defaults to "indent,eol,start"
- 'complete' doesn't include "i"
+- 'display' defaults to "lastline"
- 'encoding' defaults to "utf-8"
- 'formatoptions' defaults to "tcqj"
- 'hlsearch' is set by default