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 daa4ce66b1..9001256cdf 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -737,7 +737,7 @@ A jump table for the options with a short description can be found at |Q_op|. deleted indent; Vi puts the cursor somewhere in the deleted indent}. *'autoread'* *'ar'* *'noautoread'* *'noar'* -'autoread' 'ar' boolean (default off) +'autoread' 'ar' boolean (default on) global or local to buffer |global-local| When a file has been detected to have been changed outside of Vim and it has not been changed inside of Vim, automatically read it again. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 0a26041417..1d2b695470 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -28,6 +28,7 @@ these differences. ============================================================================== 2. Option defaults *nvim-option-defaults* +- 'autoread' is set by default - 'backspace' defaults to "indent,eol,start" - 'encoding' defaults to "utf-8" - 'formatoptions' defaults to "tcqj" diff --git a/src/nvim/option.c b/src/nvim/option.c index bd6126f238..923c2e3748 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -415,9 +415,9 @@ static vimoption_T {"autoindent", "ai", P_BOOL|P_VI_DEF, (char_u *)&p_ai, PV_AI, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, - {"autoread", "ar", P_BOOL|P_VI_DEF, + {"autoread", "ar", P_BOOL|P_VIM, (char_u *)&p_ar, PV_AR, - {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, {"autowrite", "aw", P_BOOL|P_VI_DEF, (char_u *)&p_aw, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, |