diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-08 07:21:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 07:21:14 +0800 |
| commit | dc2379b89bd00cf7aa661e1b000d2a419843df3f (patch) | |
| tree | 3f115a3662f867f701f025f01c2ca50b524538ae /src/nvim | |
| parent | 5f3579e6ea12659d48e92b2126f83777908c28fc (diff) | |
| parent | c38764182a966f12b91bdc9b9ff6228621238483 (diff) | |
| download | rneovim-dc2379b89bd00cf7aa661e1b000d2a419843df3f.tar.gz rneovim-dc2379b89bd00cf7aa661e1b000d2a419843df3f.tar.bz2 rneovim-dc2379b89bd00cf7aa661e1b000d2a419843df3f.zip | |
Merge pull request #27767 from zeertzjq/vim-9.1.0154
vim-patch:9.1.{0154,0158}: shm=F not respected when reloading buffer with 'autoread'
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/fileio.c | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 2c96e4bd87..695631a6f7 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -3153,7 +3153,7 @@ void buf_reload(buf_T *buf, int orig_mode, bool reload_options) curbuf->b_flags |= BF_CHECK_RO; // check for RO again keep_filetype = true; // don't detect 'filetype' if (readfile(buf->b_ffname, buf->b_fname, 0, 0, - (linenr_T)MAXLNUM, &ea, flags, false) != OK) { + (linenr_T)MAXLNUM, &ea, flags, shortmess(SHM_FILEINFO)) != OK) { if (!aborting()) { semsg(_("E321: Could not reload \"%s\""), buf->b_fname); } 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]" |