aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-03-08 06:52:14 +0800
committerzeertzjq <zeertzjq@outlook.com>2024-03-08 06:53:37 +0800
commitd741e5d1629948876cf8bdcacf6c8bc8a4924f94 (patch)
treef07971f78cf303d71e0d92cf72fb06236f7a2fe6 /src
parent5f3579e6ea12659d48e92b2126f83777908c28fc (diff)
downloadrneovim-d741e5d1629948876cf8bdcacf6c8bc8a4924f94.tar.gz
rneovim-d741e5d1629948876cf8bdcacf6c8bc8a4924f94.tar.bz2
rneovim-d741e5d1629948876cf8bdcacf6c8bc8a4924f94.zip
vim-patch:9.1.0154: shm=F not respected when reloading buffer with 'autoread'
Problem: shm=F not respected when reloading buffer with 'autoread' Solution: Check SHM_FILEINFO in buf_check_timestamp() (Shougo Matsushita) closes: vim/vim#14144 https://github.com/vim/vim/commit/9db39b0ec90600bb41faec3a12b934b17c298b1f Co-authored-by: Shougo Matsushita <Shougo.Matsu@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/nvim/fileio.c2
-rw-r--r--src/nvim/options.lua3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 2c96e4bd87..e6a1afeaec 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -3008,7 +3008,7 @@ int buf_check_timestamp(buf_T *buf)
can_reload = true;
}
- if (mesg != NULL) {
+ if (mesg != NULL && !shortmess(SHM_FILEINFO)) {
char *path = home_replace_save(buf, buf->b_fname);
if (!helpmesg) {
mesg2 = "";
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4452df413a..72f9ff849d 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -7331,7 +7331,8 @@ return {
items, for instance "scanning tags"
q do not show "recording @a" when recording a macro *shm-q*
F don't give the file info when editing a file, like *shm-F*
- `:silent` was used for the command
+ `:silent` was used for the command; note that this also
+ affects messages from 'autoread' reloading
S do not show search count message when searching, e.g. *shm-S*
"[1/5]"