projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 00326db2 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.266 | |
| 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 6.2.266 | |
| 11 | Problem: When redirecting output and using ":silent", line breaks are | |
| 12 | missing from output of ":map" and ":tselect". Alignment of | |
| 13 | columns is wrong. | |
| 14 | Solution: Insert a line break where "msg_didout" was tested. Update msg_col | |
| 15 | when redirecting and using ":silent". | |
| 16 | Files: src/getchar.c, src/message.c | |
| 17 | ||
| 18 | ||
| 19 | *** ../vim-6.2.265/src/getchar.c Sun Jan 25 20:30:03 2004 | |
| 20 | --- src/getchar.c Tue Feb 17 17:47:22 2004 | |
| 21 | *************** | |
| 22 | *** 3462,3468 **** | |
| 23 | { | |
| 24 | int len = 1; | |
| 25 | ||
| 26 | ! if (msg_didout) | |
| 27 | msg_putchar('\n'); | |
| 28 | if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE) | |
| 29 | msg_putchar('!'); /* :map! */ | |
| 30 | --- 3469,3475 ---- | |
| 31 | { | |
| 32 | int len = 1; | |
| 33 | ||
| 34 | ! if (msg_didout || msg_silent != 0) | |
| 35 | msg_putchar('\n'); | |
| 36 | if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE) | |
| 37 | msg_putchar('!'); /* :map! */ | |
| 38 | *** ../vim-6.2.265/src/message.c Sun Feb 8 17:09:51 2004 | |
| 39 | --- src/message.c Sun Feb 15 21:04:31 2004 | |
| 40 | *************** | |
| 41 | *** 468,473 **** | |
| 42 | --- 468,474 ---- | |
| 43 | */ | |
| 44 | if (emsg_silent != 0) | |
| 45 | { | |
| 46 | + msg_start(); | |
| 47 | redir_write(s, -1); | |
| 48 | return TRUE; | |
| 49 | } | |
| 50 | *************** | |
| 51 | *** 2477,2482 **** | |
| 52 | --- 2478,2486 ---- | |
| 53 | ++cur_col; | |
| 54 | ++s; | |
| 55 | } | |
| 56 | + | |
| 57 | + if (msg_silent != 0) /* should update msg_col */ | |
| 58 | + msg_col = cur_col; | |
| 59 | } | |
| 60 | } | |
| 61 | ||
| 62 | *************** | |
| 63 | *** 2522,2528 **** | |
| 64 | { | |
| 65 | if (msg_silent != 0) /* nothing to advance to */ | |
| 66 | { | |
| 67 | ! msg_putchar(' '); /* insert something for redirection */ | |
| 68 | return; | |
| 69 | } | |
| 70 | if (col >= Columns) /* not enough room */ | |
| 71 | --- 2526,2532 ---- | |
| 72 | { | |
| 73 | if (msg_silent != 0) /* nothing to advance to */ | |
| 74 | { | |
| 75 | ! msg_col = col; /* for redirection, may fill it up later */ | |
| 76 | return; | |
| 77 | } | |
| 78 | if (col >= Columns) /* not enough room */ | |
| 79 | *** ../vim-6.2.265/src/version.c Tue Feb 17 20:41:09 2004 | |
| 80 | --- src/version.c Tue Feb 17 20:42:45 2004 | |
| 81 | *************** | |
| 82 | *** 639,640 **** | |
| 83 | --- 639,642 ---- | |
| 84 | { /* Add new patch number below this line */ | |
| 85 | + /**/ | |
| 86 | + 266, | |
| 87 | /**/ | |
| 88 | ||
| 89 | -- | |
| 90 | hundred-and-one symptoms of being an internet addict: | |
| 91 | 169. You hire a housekeeper for your home page. | |
| 92 | ||
| 93 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 94 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 95 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 96 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |