mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 20:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: suppress "is a directory" messages with shortmess 'F' (#18298)

Browse Source 
When 'F' is in 'shortmess', don't show messages when editing a
directory. This fixes a regression introduced by 0956283.

(cherry picked from commit c9f90ee687)

Co-authored-by: Gregory Anders <greg@gpanders.com>
This commit is contained in:
github-actions[bot]
2022-04-28 15:35:03 -06:00
committed by GitHub
parent 9e5cef945a
commit ef43e7d1f6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/fileio.c
View File

@@ -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 // because reading the file may actually work, but then creating the
// swap file may destroy it! Reported on MS-DOS and Win 95. // swap file may destroy it! Reported on MS-DOS and Win 95.
if (after_pathsep((const char *)fname, (const char *)(fname + namelen))) { 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_end();
msg_scroll = msg_save; msg_scroll = msg_save;
return NOTDONE; return NOTDONE;
@@ -379,7 +381,9 @@ int readfile(char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_ski
#endif #endif
) { ) {
if (S_ISDIR(perm)) { 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 { } else {
filemess(curbuf, fname, (char_u *)_("is not a file"), 0); filemess(curbuf, fname, (char_u *)_("is not a file"), 0);
} }