projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 468bf62c AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.0.223 | |
| 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.223 | |
| 11 | Problem: Unprintable characters in completion text mess up the popup menu. | |
| 12 | (Gombault Damien) | |
| 13 | Solution: Use strtrans() to make the text printable. | |
| 14 | Files: src/charset.c, src/popupmnu.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.222/src/charset.c Tue Apr 18 00:04:40 2006 | |
| 18 | --- src/charset.c Sat Mar 24 21:10:37 2007 | |
| 19 | *************** | |
| 20 | *** 317,323 **** | |
| 21 | } | |
| 22 | } | |
| 23 | ||
| 24 | ! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(PROTO) | |
| 25 | /* | |
| 26 | * Translate a string into allocated memory, replacing special chars with | |
| 27 | * printable chars. Returns NULL when out of memory. | |
| 28 | --- 317,324 ---- | |
| 29 | } | |
| 30 | } | |
| 31 | ||
| 32 | ! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(FEAT_INS_EXPAND) \ | |
| 33 | ! || defined(PROTO) | |
| 34 | /* | |
| 35 | * Translate a string into allocated memory, replacing special chars with | |
| 36 | * printable chars. Returns NULL when out of memory. | |
| 37 | *** ../vim-7.0.222/src/popupmnu.c Tue Aug 22 21:51:18 2006 | |
| 38 | --- src/popupmnu.c Sat Mar 24 21:07:39 2007 | |
| 39 | *************** | |
| 40 | *** 280,287 **** | |
| 41 | w = ptr2cells(p); | |
| 42 | if (*p == NUL || *p == TAB || totwidth + w > pum_width) | |
| 43 | { | |
| 44 | ! /* Display the text that fits or comes before a Tab. */ | |
| 45 | ! screen_puts_len(s, (int)(p - s), row, col, attr); | |
| 46 | col += width; | |
| 47 | ||
| 48 | if (*p != TAB) | |
| 49 | --- 280,299 ---- | |
| 50 | w = ptr2cells(p); | |
| 51 | if (*p == NUL || *p == TAB || totwidth + w > pum_width) | |
| 52 | { | |
| 53 | ! /* Display the text that fits or comes before a Tab. | |
| 54 | ! * First convert it to printable characters. */ | |
| 55 | ! char_u *st; | |
| 56 | ! int saved = *p; | |
| 57 | ! | |
| 58 | ! *p = NUL; | |
| 59 | ! st = transstr(s); | |
| 60 | ! *p = saved; | |
| 61 | ! if (st != NULL) | |
| 62 | ! { | |
| 63 | ! screen_puts_len(st, (int)STRLEN(st), row, col, | |
| 64 | ! attr); | |
| 65 | ! vim_free(st); | |
| 66 | ! } | |
| 67 | col += width; | |
| 68 | ||
| 69 | if (*p != TAB) | |
| 70 | *** ../vim-7.0.222/src/version.c Tue Mar 27 11:00:43 2007 | |
| 71 | --- src/version.c Tue Mar 27 12:42:15 2007 | |
| 72 | *************** | |
| 73 | *** 668,669 **** | |
| 74 | --- 668,671 ---- | |
| 75 | { /* Add new patch number below this line */ | |
| 76 | + /**/ | |
| 77 | + 223, | |
| 78 | /**/ | |
| 79 | ||
| 80 | -- | |
| 81 | Violators can be fined, arrested or jailed for making ugly faces at a dog. | |
| 82 | [real standing law in Oklahoma, United States of America] | |
| 83 | ||
| 84 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 85 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 86 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 87 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |