updated for version 7.0-133

diff --git a/src/edit.c b/src/edit.c
index f0aecef208994c25b199eb7718cb30aa2c364a80..3beb431b44ab8392e547166f0193fc9b69bc0b08 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -3909,6 +3909,8 @@ ins_compl_get_exp(ini)
            {
                int     flags = 0;
 
+               ++msg_silent;  /* Don't want messages for wrapscan. */
+
                /* ctrl_x_mode == CTRL_X_WHOLE_LINE || word-wise search that
                 * has added a word that was at the beginning of the line */
                if (    ctrl_x_mode == CTRL_X_WHOLE_LINE
@@ -3920,6 +3922,7 @@ ins_compl_get_exp(ini)
                                                              compl_direction,
                                 compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG,
                                                        RE_LAST, (linenr_T)0);
+               --msg_silent;
                if (!compl_started)
                {
                    /* set "compl_started" even on fail */

diff --git a/src/globals.h b/src/globals.h
index b768127fd8479abab4244cbf92a3c11cbe9caca1..5d7295a84339eeaa4f2c7fbd47366191f560741a 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -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,
                                               unless 'debug' is set. */
 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
 EXTERN int     emsg_skip INIT(= 0);        /* don't display errors for
                                               expression that is skipped */

diff --git a/src/message.c b/src/message.c
index 0b0ffa3809e3db1a4fca8248b378c55d0f4e3a64..2eee604421591991906a58a7b513ad1401767f0d 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -53,7 +53,6 @@ struct msg_hist
 static struct msg_hist *first_msg_hist = NULL;
 static struct msg_hist *last_msg_hist = NULL;
 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.

diff --git a/src/search.c b/src/search.c
index 1c38060ee747d8b90b43068d7e8f1bd9b4c78653..de99f2c43938f8be1a2c99bb092629af16895e0d 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -4688,6 +4688,7 @@ find_pattern_in_path(ptr, dir, len, whole, skip_comments,
 #ifdef FEAT_INS_EXPAND
                    if (action == ACTION_EXPAND)
                    {
+                       msg_hist_off = TRUE;    /* reset in msg_trunc_attr() */
                        vim_snprintf((char*)IObuff, IOSIZE,
                                _("Scanning included file: %s"),
                                (char *)new_fname);

diff --git a/src/version.c b/src/version.c
index b8be64aaa24d0ff1053297e215b25e938a107309..373fa1bf8779d49baa824b4784a7788db2cd2193 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/