mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.0-133
This commit is contained in:
@@ -3909,6 +3909,8 @@ ins_compl_get_exp(ini)
|
|||||||
{
|
{
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
|
|
||||||
|
++msg_silent; /* Don't want messages for wrapscan. */
|
||||||
|
|
||||||
/* ctrl_x_mode == CTRL_X_WHOLE_LINE || word-wise search that
|
/* ctrl_x_mode == CTRL_X_WHOLE_LINE || word-wise search that
|
||||||
* has added a word that was at the beginning of the line */
|
* has added a word that was at the beginning of the line */
|
||||||
if ( ctrl_x_mode == CTRL_X_WHOLE_LINE
|
if ( ctrl_x_mode == CTRL_X_WHOLE_LINE
|
||||||
@@ -3920,6 +3922,7 @@ ins_compl_get_exp(ini)
|
|||||||
compl_direction,
|
compl_direction,
|
||||||
compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG,
|
compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG,
|
||||||
RE_LAST, (linenr_T)0);
|
RE_LAST, (linenr_T)0);
|
||||||
|
--msg_silent;
|
||||||
if (!compl_started)
|
if (!compl_started)
|
||||||
{
|
{
|
||||||
/* set "compl_started" even on fail */
|
/* set "compl_started" even on fail */
|
||||||
|
@@ -166,6 +166,7 @@ EXTERN int msg_nowait INIT(= FALSE); /* don't wait for this msg */
|
|||||||
EXTERN int emsg_off INIT(= 0); /* don't display errors for now,
|
EXTERN int emsg_off INIT(= 0); /* don't display errors for now,
|
||||||
unless 'debug' is set. */
|
unless 'debug' is set. */
|
||||||
EXTERN int info_message INIT(= FALSE); /* printing informative message */
|
EXTERN int info_message INIT(= FALSE); /* printing informative message */
|
||||||
|
EXTERN int msg_hist_off INIT(= FALSE); /* don't add messages to history */
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
EXTERN int emsg_skip INIT(= 0); /* don't display errors for
|
EXTERN int emsg_skip INIT(= 0); /* don't display errors for
|
||||||
expression that is skipped */
|
expression that is skipped */
|
||||||
|
@@ -53,7 +53,6 @@ struct msg_hist
|
|||||||
static struct msg_hist *first_msg_hist = NULL;
|
static struct msg_hist *first_msg_hist = NULL;
|
||||||
static struct msg_hist *last_msg_hist = NULL;
|
static struct msg_hist *last_msg_hist = NULL;
|
||||||
static int msg_hist_len = 0;
|
static int msg_hist_len = 0;
|
||||||
static int msg_hist_off = FALSE; /* don't add messages to history */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* When writing messages to the screen, there are many different situations.
|
* When writing messages to the screen, there are many different situations.
|
||||||
|
@@ -4688,6 +4688,7 @@ find_pattern_in_path(ptr, dir, len, whole, skip_comments,
|
|||||||
#ifdef FEAT_INS_EXPAND
|
#ifdef FEAT_INS_EXPAND
|
||||||
if (action == ACTION_EXPAND)
|
if (action == ACTION_EXPAND)
|
||||||
{
|
{
|
||||||
|
msg_hist_off = TRUE; /* reset in msg_trunc_attr() */
|
||||||
vim_snprintf((char*)IObuff, IOSIZE,
|
vim_snprintf((char*)IObuff, IOSIZE,
|
||||||
_("Scanning included file: %s"),
|
_("Scanning included file: %s"),
|
||||||
(char *)new_fname);
|
(char *)new_fname);
|
||||||
|
@@ -666,6 +666,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 */
|
||||||
|
/**/
|
||||||
|
133,
|
||||||
/**/
|
/**/
|
||||||
132,
|
132,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user