aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.1570

Browse Source 
Problem:    There is no way to avoid the message when editing a file.
Solution:   Add the "F" flag to 'shortmess'. (Shougo, closes #686)
This commit is contained in:
Bram Moolenaar
2016-03-15 15:09:29 +01:00
parent e27dba499a
commit 426dd02195
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/options.txt
View File

@@ -6533,7 +6533,9 @@ A jump table for the options with a short description can be found at |Q_op|.
c don't give |ins-completion-menu| messages. For example, c don't give |ins-completion-menu| messages. For example,
"-- XXX completion (YYY)", "match 1 of 2", "The only match", "-- XXX completion (YYY)", "match 1 of 2", "The only match",
"Pattern not found", "Back at original", etc. "Pattern not found", "Back at original", etc.
q use "recording" instead of "recording @a" q use "recording" instead of "recording @a"
F don't give the file info when editing a file, like `:silent`
was used for the command
This gives you the opportunity to avoid that a change between buffers This gives you the opportunity to avoid that a change between buffers
requires you to hit <Enter>, but still gives as useful a message as requires you to hit <Enter>, but still gives as useful a message as

5
src/buffer.c
View File

@@ -139,14 +139,19 @@ open_buffer(
#endif #endif
) )
{ {
int old_msg_silent = msg_silent;
#ifdef FEAT_NETBEANS_INTG #ifdef FEAT_NETBEANS_INTG
int oldFire = netbeansFireChanges; int oldFire = netbeansFireChanges;
netbeansFireChanges = 0; netbeansFireChanges = 0;
#endif #endif
if (shortmess(SHM_FILEINFO))
msg_silent = 1;
retval = readfile(curbuf->b_ffname, curbuf->b_fname, retval = readfile(curbuf->b_ffname, curbuf->b_fname,
(linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, eap, (linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, eap,
flags | READ_NEW); flags | READ_NEW);
msg_silent = old_msg_silent;
#ifdef FEAT_NETBEANS_INTG #ifdef FEAT_NETBEANS_INTG
netbeansFireChanges = oldFire; netbeansFireChanges = oldFire;
#endif #endif

6
src/ex_cmds.c
View File

@@ -2605,7 +2605,8 @@ ex_file(exarg_T *eap)
return; return;
} }
/* print full file name if :cd used */ /* print full file name if :cd used */
fileinfo(FALSE, FALSE, eap->forceit); if (!shortmess(SHM_FILEINFO))
fileinfo(FALSE, FALSE, eap->forceit);
} }
/* /*
@@ -3884,7 +3885,8 @@ do_ecmd(
msg_scroll = msg_scroll_save; msg_scroll = msg_scroll_save;
msg_scrolled_ign = TRUE; msg_scrolled_ign = TRUE;
fileinfo(FALSE, TRUE, FALSE); if (!shortmess(SHM_FILEINFO))
fileinfo(FALSE, TRUE, FALSE);
msg_scrolled_ign = FALSE; msg_scrolled_ign = FALSE;
} }

3
src/option.h
View File

@@ -214,7 +214,8 @@
#define SHM_INTRO 'I' /* intro messages */ #define SHM_INTRO 'I' /* intro messages */
#define SHM_COMPLETIONMENU 'c' /* completion menu messages */ #define SHM_COMPLETIONMENU 'c' /* completion menu messages */
#define SHM_RECORDING 'q' /* short recording message */ #define SHM_RECORDING 'q' /* short recording message */
#define SHM_ALL "rmfixlnwaWtToOsAIcq" /* all possible flags for 'shm' */ #define SHM_FILEINFO 'F' /* no file info messages */
#define SHM_ALL "rmfixlnwaWtToOsAIcqF" /* all possible flags for 'shm' */
/* characters for p_go: */ /* characters for p_go: */
#define GO_ASEL 'a' /* autoselect */ #define GO_ASEL 'a' /* autoselect */

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1570,
/**/ /**/
1569, 1569,
/**/ /**/