mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
updated for version 7.4.314
Problem: Completion messages can get in the way of a plugin. Solution: Add 'c' flag to 'shortmess' option. (Shougo Matsu)
This commit is contained in:
@@ -6254,6 +6254,9 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
A don't give the "ATTENTION" message when an existing swap file
|
A don't give the "ATTENTION" message when an existing swap file
|
||||||
is found.
|
is found.
|
||||||
I don't give the intro message when starting Vim |:intro|.
|
I don't give the intro message when starting Vim |:intro|.
|
||||||
|
c don't give |ins-completion-menu| messages. For example,
|
||||||
|
"-- XXX completion (YYY)", "match 1 of 2", "The only match",
|
||||||
|
"Pattern not found", "Back at original", etc.
|
||||||
|
|
||||||
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
|
||||||
|
23
src/edit.c
23
src/edit.c
@@ -3854,7 +3854,8 @@ ins_compl_prep(c)
|
|||||||
ins_compl_free();
|
ins_compl_free();
|
||||||
compl_started = FALSE;
|
compl_started = FALSE;
|
||||||
compl_matches = 0;
|
compl_matches = 0;
|
||||||
msg_clr_cmdline(); /* necessary for "noshowmode" */
|
if (!shortmess(SHM_COMPLETIONMENU))
|
||||||
|
msg_clr_cmdline(); /* necessary for "noshowmode" */
|
||||||
ctrl_x_mode = 0;
|
ctrl_x_mode = 0;
|
||||||
compl_enter_selects = FALSE;
|
compl_enter_selects = FALSE;
|
||||||
if (edit_submode != NULL)
|
if (edit_submode != NULL)
|
||||||
@@ -5285,7 +5286,8 @@ ins_complete(c)
|
|||||||
{
|
{
|
||||||
ctrl_x_mode = 0;
|
ctrl_x_mode = 0;
|
||||||
edit_submode = NULL;
|
edit_submode = NULL;
|
||||||
msg_clr_cmdline();
|
if (!shortmess(SHM_COMPLETIONMENU))
|
||||||
|
msg_clr_cmdline();
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5544,15 +5546,18 @@ ins_complete(c)
|
|||||||
|
|
||||||
/* Show a message about what (completion) mode we're in. */
|
/* Show a message about what (completion) mode we're in. */
|
||||||
showmode();
|
showmode();
|
||||||
if (edit_submode_extra != NULL)
|
if (!shortmess(SHM_COMPLETIONMENU))
|
||||||
{
|
{
|
||||||
if (!p_smd)
|
if (edit_submode_extra != NULL)
|
||||||
msg_attr(edit_submode_extra,
|
{
|
||||||
edit_submode_highl < HLF_COUNT
|
if (!p_smd)
|
||||||
? hl_attr(edit_submode_highl) : 0);
|
msg_attr(edit_submode_extra,
|
||||||
|
edit_submode_highl < HLF_COUNT
|
||||||
|
? hl_attr(edit_submode_highl) : 0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
msg_clr_cmdline(); /* necessary for "noshowmode" */
|
||||||
}
|
}
|
||||||
else
|
|
||||||
msg_clr_cmdline(); /* necessary for "noshowmode" */
|
|
||||||
|
|
||||||
/* Show the popup menu, unless we got interrupted. */
|
/* Show the popup menu, unless we got interrupted. */
|
||||||
if (!compl_interrupted)
|
if (!compl_interrupted)
|
||||||
|
@@ -212,7 +212,8 @@
|
|||||||
#define SHM_SEARCH 's' /* no search hit bottom messages */
|
#define SHM_SEARCH 's' /* no search hit bottom messages */
|
||||||
#define SHM_ATTENTION 'A' /* no ATTENTION messages */
|
#define SHM_ATTENTION 'A' /* no ATTENTION messages */
|
||||||
#define SHM_INTRO 'I' /* intro messages */
|
#define SHM_INTRO 'I' /* intro messages */
|
||||||
#define SHM_ALL "rmfixlnwaWtToOsAI" /* all possible flags for 'shm' */
|
#define SHM_COMPLETIONMENU 'c' /* completion menu messages */
|
||||||
|
#define SHM_ALL "rmfixlnwaWtToOsAIc" /* all possible flags for 'shm' */
|
||||||
|
|
||||||
/* characters for p_go: */
|
/* characters for p_go: */
|
||||||
#define GO_ASEL 'a' /* autoselect */
|
#define GO_ASEL 'a' /* autoselect */
|
||||||
|
@@ -42,7 +42,7 @@
|
|||||||
*
|
*
|
||||||
* The part of the buffer that is displayed in a window is set with:
|
* The part of the buffer that is displayed in a window is set with:
|
||||||
* - w_topline (first buffer line in window)
|
* - w_topline (first buffer line in window)
|
||||||
* - w_topfill (filler line above the first line)
|
* - w_topfill (filler lines above the first line)
|
||||||
* - w_leftcol (leftmost window cell in window),
|
* - w_leftcol (leftmost window cell in window),
|
||||||
* - w_skipcol (skipped window cells of first line)
|
* - w_skipcol (skipped window cells of first line)
|
||||||
*
|
*
|
||||||
@@ -9683,7 +9683,8 @@ showmode()
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef FEAT_INS_EXPAND
|
#ifdef FEAT_INS_EXPAND
|
||||||
if (edit_submode != NULL) /* CTRL-X in Insert mode */
|
/* CTRL-X in Insert mode */
|
||||||
|
if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU))
|
||||||
{
|
{
|
||||||
/* These messages can get long, avoid a wrap in a narrow
|
/* These messages can get long, avoid a wrap in a narrow
|
||||||
* window. Prefer showing edit_submode_extra. */
|
* window. Prefer showing edit_submode_extra. */
|
||||||
|
@@ -734,6 +734,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 */
|
||||||
|
/**/
|
||||||
|
314,
|
||||||
/**/
|
/**/
|
||||||
313,
|
313,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user