From c9f90ee687e0aba6e80033b889ebe2f70d88724f Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Thu, 28 Apr 2022 14:39:08 -0600 Subject: [PATCH] fix: suppress "is a directory" messages with shortmess 'F' When 'F' is in 'shortmess', don't show messages when editing a directory. This fixes a regression introduced by 0956283. --- src/nvim/fileio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 25c99af41b..c5bb9442bc 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -359,7 +359,9 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski // because reading the file may actually work, but then creating the // swap file may destroy it! Reported on MS-DOS and Win 95. if (after_pathsep((const char *)fname, (const char *)(fname + namelen))) { - filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); + if (!silent) { + filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); + } msg_end(); msg_scroll = msg_save; return NOTDONE; @@ -379,7 +381,9 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski #endif ) { if (S_ISDIR(perm)) { - filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); + if (!silent) { + filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); + } } else { filemess(curbuf, fname, (char_u *)_("is not a file"), 0); }