diff options
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | src/nvim/option.c | 4 |
3 files changed, 4 insertions, 3 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 diff --git a/src/nvim/option.c b/src/nvim/option.c index 9eb581909e..b45002e29c 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -645,9 +645,9 @@ static vimoption_T {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, (char_u *)&p_dir, PV_NONE, {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT}, - {"display", "dy", P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP, + {"display", "dy", P_STRING|P_VIM|P_COMMA|P_RALL|P_NODUP, (char_u *)&p_dy, PV_NONE, - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)"", (char_u *)"lastline"} SCRIPTID_INIT}, {"eadirection", "ead", P_STRING|P_VI_DEF, (char_u *)&p_ead, PV_NONE, {(char_u *)"both", (char_u *)0L} |