commit 188537efb32d02081c1821cb5b48fbcf59230732
parent 521e91e1c420bd5c94c35908181dbba81e58dd0f
Author: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 28 Apr 2022 15:27:34 -0600
fix: suppress "is a directory" messages with shortmess 'F' (#18296)
When 'F' is in 'shortmess', don't show messages when editing a
directory. This fixes a regression introduced by 0956283.
Diffstat:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git 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);
}