diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-14 12:32:39 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-14 12:32:39 +0000 |
| commit | df40adfcf4f29e4ee4325bbd496c0ad232244b1a (patch) | |
| tree | 428246ae8a590ce6a0605c4f30e8a136939e46af /src | |
| parent | c67764a7053fd2b4fe9c7016fb89cf81691edbe4 (diff) | |
updated for version 7.0-133v7.0.133
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 3 | ||||
| -rw-r--r-- | src/globals.h | 1 | ||||
| -rw-r--r-- | src/message.c | 1 | ||||
| -rw-r--r-- | src/search.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c index f0aecef208..3beb431b44 100644 --- 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 b768127fd8..5d7295a843 100644 --- 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 0b0ffa3809..2eee604421 100644 --- 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 1c38060ee7..de99f2c439 100644 --- 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 b8be64aaa2..373fa1bf87 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 133, +/**/ 132, /**/ 131, |