diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 13 | ||||
| -rw-r--r-- | src/nvim/ex_cmds.c | 11 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 1 |
4 files changed, 21 insertions, 7 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8f5ae3445e..4661a191a9 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -143,10 +143,17 @@ open_buffer ( if (curbuf->b_ffname != NULL ) { + int old_msg_silent = msg_silent; + if (shortmess(SHM_FILEINFO)) { + msg_silent = 1; + } + retval = readfile(curbuf->b_ffname, curbuf->b_fname, - (linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, eap, - flags | READ_NEW); - /* Help buffer is filtered. */ + (linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, eap, + flags | READ_NEW); + msg_silent = old_msg_silent; + + // Help buffer is filtered. if (curbuf->b_help) fix_help_buffer(); } else if (read_stdin) { diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index decb5e95bc..5ea5beb478 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1506,8 +1506,11 @@ void ex_file(exarg_T *eap) if (rename_buffer(eap->arg) == FAIL) return; } - /* print full file name if :cd used */ - fileinfo(FALSE, FALSE, eap->forceit); + + if (!shortmess(SHM_FILEINFO)) { + // print full file name if :cd used + fileinfo(false, false, eap->forceit); + } } /* @@ -2483,7 +2486,9 @@ do_ecmd ( msg_scroll = msg_scroll_save; msg_scrolled_ign = TRUE; - fileinfo(FALSE, TRUE, FALSE); + if (!shortmess(SHM_FILEINFO)) { + fileinfo(false, true, false); + } msg_scrolled_ign = FALSE; } diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 547bd9442c..8e74e5036e 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -172,6 +172,7 @@ enum { SHM_INTRO = 'I', ///< Intro messages. SHM_COMPLETIONMENU = 'c', ///< Completion menu messages. SHM_RECORDING = 'q', ///< Short recording message. + SHM_FILEINFO = 'F', ///< No file info messages. }; /// Represented by 'a' flag. #define SHM_ALL_ABBREVIATIONS ((char_u[]) { \ @@ -183,7 +184,7 @@ enum { SHM_RO, SHM_MOD, SHM_FILE, SHM_LAST, SHM_TEXT, SHM_LINES, SHM_NEW, SHM_WRI, \ SHM_ABBREVIATIONS, SHM_WRITE, SHM_TRUNC, SHM_TRUNCALL, SHM_OVER, \ SHM_OVERALL, SHM_SEARCH, SHM_ATTENTION, SHM_INTRO, SHM_COMPLETIONMENU, \ - SHM_RECORDING, \ + SHM_RECORDING, SHM_FILEINFO, \ 0, \ }) diff --git a/src/nvim/version.c b/src/nvim/version.c index b934ac6d47..24b79e371f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -69,6 +69,7 @@ static char *features[] = { // clang-format off static int included_patches[] = { + 1570, 1511, 1366, |