Mercurial > vim
changeset 34495:d43c2e4b645c v9.1.0154
patch 9.1.0154: shm=F not respected when reloading buffer with 'autoread'
Commit: https://github.com/vim/vim/commit/9db39b0ec90600bb41faec3a12b934b17c298b1f
Author: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Wed Mar 6 20:58:41 2024 +0100
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: #14144
Signed-off-by: Shougo Matsushita <Shougo.Matsu@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 06 Mar 2024 21:15:03 +0100 |
| parents | 0729698bec21 |
| children | 51554a08c105 |
| files | runtime/doc/options.txt src/fileio.c src/testdir/test_options.vim src/version.c |
| diffstat | 4 files changed, 25 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Mar 03 +*options.txt* For Vim version 9.1. Last change: 2024 Mar 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7253,7 +7253,7 @@ A jump table for the options with a shor q use "recording" instead of "recording @a" *shm-q* F don't give the file info when editing a file, like *shm-F* `:silent` was used for the command; note that this also - affects messages from autocommands + affects messages from autocommands and 'autoread' reloading S do not show search count message when searching, e.g. *shm-S* "[1/5]"
--- a/src/fileio.c +++ b/src/fileio.c @@ -4294,7 +4294,7 @@ buf_check_timestamp( #endif } - if (mesg != NULL) + if (mesg != NULL && !shortmess(SHM_FILEINFO)) { path = home_replace_save(buf, buf->b_fname); if (path != NULL)
--- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -1293,6 +1293,26 @@ func Test_shortmess_F2() call assert_fails('call test_getvalue("abc")', 'E475:') endfunc +func Test_shortmess_F3() + defer delete('X_dummy') + + set hidden + set autoread + e X_dummy + e file + + set shortmess+=F + call writefile(["foo"], 'X_dummy') + call assert_true(empty(execute('bn', ''))) + call assert_true(empty(execute('bn', ''))) + + set shortmess& + set autoread& + set hidden& + bwipe + bwipe +endfunc + func Test_local_scrolloff() set so=5 set siso=7