projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 9b411fd1 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.0.185 | |
| 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.185 | |
| 11 | Problem: Multi-byte characters in a message are displayed with attributes | |
| 12 | from what comes before it. | |
| 13 | Solution: Don't use the attributes for a multi-byte character. Do use | |
| 14 | attributes for special characters. (Yukihiro Nakadaira) | |
| 15 | Files: src/message.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.0.184/src/message.c Sat Oct 14 14:33:21 2006 | |
| 19 | --- src/message.c Sat Jan 13 17:27:31 2007 | |
| 20 | *************** | |
| 21 | *** 1556,1562 **** | |
| 22 | int c_extra = 0; | |
| 23 | char_u *p_extra = NULL; /* init to make SASC shut up */ | |
| 24 | int n; | |
| 25 | ! int attr= 0; | |
| 26 | char_u *trail = NULL; | |
| 27 | #ifdef FEAT_MBYTE | |
| 28 | int l; | |
| 29 | --- 1556,1562 ---- | |
| 30 | int c_extra = 0; | |
| 31 | char_u *p_extra = NULL; /* init to make SASC shut up */ | |
| 32 | int n; | |
| 33 | ! int attr = 0; | |
| 34 | char_u *trail = NULL; | |
| 35 | #ifdef FEAT_MBYTE | |
| 36 | int l; | |
| 37 | *************** | |
| 38 | *** 1581,1587 **** | |
| 39 | ||
| 40 | while (!got_int) | |
| 41 | { | |
| 42 | ! if (n_extra) | |
| 43 | { | |
| 44 | --n_extra; | |
| 45 | if (c_extra) | |
| 46 | --- 1581,1587 ---- | |
| 47 | ||
| 48 | while (!got_int) | |
| 49 | { | |
| 50 | ! if (n_extra > 0) | |
| 51 | { | |
| 52 | --n_extra; | |
| 53 | if (c_extra) | |
| 54 | *************** | |
| 55 | *** 1595,1601 **** | |
| 56 | col += (*mb_ptr2cells)(s); | |
| 57 | mch_memmove(buf, s, (size_t)l); | |
| 58 | buf[l] = NUL; | |
| 59 | ! msg_puts_attr(buf, attr); | |
| 60 | s += l; | |
| 61 | continue; | |
| 62 | } | |
| 63 | --- 1595,1601 ---- | |
| 64 | col += (*mb_ptr2cells)(s); | |
| 65 | mch_memmove(buf, s, (size_t)l); | |
| 66 | buf[l] = NUL; | |
| 67 | ! msg_puts(buf); | |
| 68 | s += l; | |
| 69 | continue; | |
| 70 | } | |
| 71 | *************** | |
| 72 | *** 1635,1640 **** | |
| 73 | --- 1635,1643 ---- | |
| 74 | p_extra = transchar_byte(c); | |
| 75 | c_extra = NUL; | |
| 76 | c = *p_extra++; | |
| 77 | + /* Use special coloring to be able to distinguish <hex> from | |
| 78 | + * the same in plain text. */ | |
| 79 | + attr = hl_attr(HLF_8); | |
| 80 | } | |
| 81 | else if (c == ' ' && trail != NULL && s > trail) | |
| 82 | { | |
| 83 | *** ../vim-7.0.184/src/version.c Tue Jan 16 15:17:43 2007 | |
| 84 | --- src/version.c Tue Jan 16 15:43:37 2007 | |
| 85 | *************** | |
| 86 | *** 668,669 **** | |
| 87 | --- 668,671 ---- | |
| 88 | { /* Add new patch number below this line */ | |
| 89 | + /**/ | |
| 90 | + 185, | |
| 91 | /**/ | |
| 92 | ||
| 93 | -- | |
| 94 | This planet has -- or rather had -- a problem, which was this: most | |
| 95 | of the people living on it were unhappy for pretty much of the time. | |
| 96 | Many solutions were suggested for this problem, but most of these | |
| 97 | were largely concerned with the movements of small green pieces of | |
| 98 | paper, which is odd because on the whole it wasn't the small green | |
| 99 | pieces of paper that were unhappy. | |
| 100 | -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" | |
| 101 | ||
| 102 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 103 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 104 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 105 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |