aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-02-15 08:10:21 +0800
committerGitHub <noreply@github.com>2022-02-15 08:10:21 +0800
commit8051fa1aff24952b9d077ba44bc2b84fd1626345 (patch)
tree1471237a96e2ef38db915b67b7f1f6257bf9ced5 /runtime
parent758d7726df1cabd3ed93403e087dab93fc3ceba7 (diff)
parent5220891571a799fd630cbcbe836d1f9e3d2dc1fa (diff)
downloadrneovim-8051fa1aff24952b9d077ba44bc2b84fd1626345.tar.gz
rneovim-8051fa1aff24952b9d077ba44bc2b84fd1626345.tar.bz2
rneovim-8051fa1aff24952b9d077ba44bc2b84fd1626345.zip
Merge pull request #17394 from zeertzjq/vim-8.2.4343
vim-patch:8.2.4343: when reloading not all properties are detected
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/editing.txt5
-rw-r--r--runtime/doc/eval.txt5
2 files changed, 10 insertions, 0 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 3d0287b0cd..8ddc661c0e 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1450,6 +1450,11 @@ If you don't get warned often enough you can use the following command.
if it exists now.
Once a file has been checked the timestamp is reset,
you will not be warned again.
+ Syntax highlighting, marks, diff status,
+ 'fileencoding', 'fileformat' and 'binary' options
+ are not changed. See |v:fcs_choice| to reload these
+ too (for example, if a code formatting tools has
+ changed the file).
:[N]checkt[ime] {filename}
:[N]checkt[ime] [N]
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fc788fba59..fc422f13e5 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1882,6 +1882,11 @@ v:fcs_choice What should happen after a |FileChangedShell| event was
do with the affected buffer:
reload Reload the buffer (does not work if
the file was deleted).
+ edit Reload the buffer and detect the
+ values for options such as
+ 'fileformat', 'fileencoding', 'binary'
+ (does not work if the file was
+ deleted).
ask Ask the user what to do, as if there
was no autocommand. Except that when
only the timestamp changed nothing