aboutsummaryrefslogtreecommitdiff
path: root/src/nvim
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-03-08 06:53:43 +0800
committerzeertzjq <zeertzjq@outlook.com>2024-03-08 07:04:39 +0800
commitc38764182a966f12b91bdc9b9ff6228621238483 (patch)
tree3f115a3662f867f701f025f01c2ca50b524538ae /src/nvim
parentd741e5d1629948876cf8bdcacf6c8bc8a4924f94 (diff)
downloadrneovim-c38764182a966f12b91bdc9b9ff6228621238483.tar.gz
rneovim-c38764182a966f12b91bdc9b9ff6228621238483.tar.bz2
rneovim-c38764182a966f12b91bdc9b9ff6228621238483.zip
vim-patch:9.1.0158: 'shortmess' "F" flag doesn't work properly with 'autoread'
Problem: 'shortmess' "F" flag doesn't work properly with 'autoread' (after 9.1.0154) Solution: Hide the file info message instead of the warning dialog (zeertzjq) closes: vim/vim#14159 closes: vim/vim#14158 https://github.com/vim/vim/commit/8a01744c563f615ae7f6b3ab7f5208214a45a8e2
Diffstat (limited to 'src/nvim')
-rw-r--r--src/nvim/fileio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index e6a1afeaec..695631a6f7 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 && !shortmess(SHM_FILEINFO)) {
+ if (mesg != NULL) {
char *path = home_replace_save(buf, buf->b_fname);
if (!helpmesg) {
mesg2 = "";
@@ -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);
}