projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.133 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.133 | |
| 11 | Problem: When searching included files messages are added to the history. | |
| 12 | Solution: Set msg_hist_off for messages about scanning included files. | |
| 13 | Set msg_silent to avoid message about wrapping around. | |
| 14 | Files: src/edit.c, src/globals.h, src/message.c, src/search.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.132/src/edit.c Tue Oct 10 15:49:41 2006 | |
| 18 | --- src/edit.c Sat Oct 14 14:22:09 2006 | |
| 19 | *************** | |
| 20 | *** 3909,3914 **** | |
| 21 | --- 3909,3916 ---- | |
| 22 | { | |
| 23 | int flags = 0; | |
| 24 | ||
| 25 | + ++msg_silent; /* Don't want messages for wrapscan. */ | |
| 26 | + | |
| 27 | /* ctrl_x_mode == CTRL_X_WHOLE_LINE || word-wise search that | |
| 28 | * has added a word that was at the beginning of the line */ | |
| 29 | if ( ctrl_x_mode == CTRL_X_WHOLE_LINE | |
| 30 | *************** | |
| 31 | *** 3920,3925 **** | |
| 32 | --- 3922,3928 ---- | |
| 33 | compl_direction, | |
| 34 | compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG, | |
| 35 | RE_LAST, (linenr_T)0); | |
| 36 | + --msg_silent; | |
| 37 | if (!compl_started) | |
| 38 | { | |
| 39 | /* set "compl_started" even on fail */ | |
| 40 | *** ../vim-7.0.132/src/globals.h Tue Sep 5 12:57:14 2006 | |
| 41 | --- src/globals.h Sat Oct 14 14:05:02 2006 | |
| 42 | *************** | |
| 43 | *** 166,171 **** | |
| 44 | --- 166,172 ---- | |
| 45 | EXTERN int emsg_off INIT(= 0); /* don't display errors for now, | |
| 46 | unless 'debug' is set. */ | |
| 47 | EXTERN int info_message INIT(= FALSE); /* printing informative message */ | |
| 48 | + EXTERN int msg_hist_off INIT(= FALSE); /* don't add messages to history */ | |
| 49 | #ifdef FEAT_EVAL | |
| 50 | EXTERN int emsg_skip INIT(= 0); /* don't display errors for | |
| 51 | expression that is skipped */ | |
| 52 | *** ../vim-7.0.132/src/message.c Tue Oct 3 17:21:04 2006 | |
| 53 | --- src/message.c Sat Oct 14 14:03:58 2006 | |
| 54 | *************** | |
| 55 | *** 53,59 **** | |
| 56 | static struct msg_hist *first_msg_hist = NULL; | |
| 57 | static struct msg_hist *last_msg_hist = NULL; | |
| 58 | static int msg_hist_len = 0; | |
| 59 | - static int msg_hist_off = FALSE; /* don't add messages to history */ | |
| 60 | ||
| 61 | /* | |
| 62 | * When writing messages to the screen, there are many different situations. | |
| 63 | --- 53,58 ---- | |
| 64 | *** ../vim-7.0.132/src/search.c Tue Aug 29 18:01:39 2006 | |
| 65 | --- src/search.c Sat Oct 14 14:15:26 2006 | |
| 66 | *************** | |
| 67 | *** 4688,4693 **** | |
| 68 | --- 4688,4694 ---- | |
| 69 | #ifdef FEAT_INS_EXPAND | |
| 70 | if (action == ACTION_EXPAND) | |
| 71 | { | |
| 72 | + msg_hist_off = TRUE; /* reset in msg_trunc_attr() */ | |
| 73 | vim_snprintf((char*)IObuff, IOSIZE, | |
| 74 | _("Scanning included file: %s"), | |
| 75 | (char *)new_fname); | |
| 76 | *** ../vim-7.0.132/src/version.c Thu Oct 12 21:15:04 2006 | |
| 77 | --- src/version.c Sat Oct 14 14:32:31 2006 | |
| 78 | *************** | |
| 79 | *** 668,669 **** | |
| 80 | --- 668,671 ---- | |
| 81 | { /* Add new patch number below this line */ | |
| 82 | + /**/ | |
| 83 | + 133, | |
| 84 | /**/ | |
| 85 | ||
| 86 | -- | |
| 87 | You have the right to remain silent. Anything you say will be | |
| 88 | misquoted, then used against you. | |
| 89 | ||
| 90 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 91 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 92 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 93 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |