]>
Commit | Line | Data |
---|---|---|
d57b4abe ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.210 | |
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.1.210 | |
11 | Problem: Listing mapping for 0xdb fails when 'encoding' is utf-8. (Tony | |
12 | Mechelynck) | |
13 | Solution: Recognize K_SPECIAL KS_EXTRA KE_CSI as a CSI byte. | |
14 | Files: src/mbyte.c | |
15 | ||
16 | ||
17 | *** ../vim-7.1.209/src/mbyte.c Fri Jan 4 17:46:46 2008 | |
18 | --- src/mbyte.c Sun Jan 6 17:13:51 2008 | |
19 | *************** | |
20 | *** 2863,2877 **** | |
21 | buf[m++] = K_SPECIAL; | |
22 | n += 2; | |
23 | } | |
24 | # ifdef FEAT_GUI | |
25 | ! else if (str[n] == CSI | |
26 | && str[n + 1] == KS_EXTRA | |
27 | && str[n + 2] == (int)KE_CSI) | |
28 | { | |
29 | buf[m++] = CSI; | |
30 | n += 2; | |
31 | } | |
32 | - # endif | |
33 | else if (str[n] == K_SPECIAL | |
34 | # ifdef FEAT_GUI | |
35 | || str[n] == CSI | |
36 | --- 2882,2898 ---- | |
37 | buf[m++] = K_SPECIAL; | |
38 | n += 2; | |
39 | } | |
40 | + else if ((str[n] == K_SPECIAL | |
41 | # ifdef FEAT_GUI | |
42 | ! || str[n] == CSI | |
43 | ! # endif | |
44 | ! ) | |
45 | && str[n + 1] == KS_EXTRA | |
46 | && str[n + 2] == (int)KE_CSI) | |
47 | { | |
48 | buf[m++] = CSI; | |
49 | n += 2; | |
50 | } | |
51 | else if (str[n] == K_SPECIAL | |
52 | # ifdef FEAT_GUI | |
53 | || str[n] == CSI | |
54 | *** ../vim-7.1.209/src/version.c Sun Jan 6 15:16:12 2008 | |
55 | --- src/version.c Sun Jan 6 17:17:25 2008 | |
56 | *************** | |
57 | *** 668,669 **** | |
58 | --- 668,671 ---- | |
59 | { /* Add new patch number below this line */ | |
60 | + /**/ | |
61 | + 210, | |
62 | /**/ | |
63 | ||
64 | -- | |
65 | ARTHUR: A scratch? Your arm's off! | |
66 | BLACK KNIGHT: No, it isn't. | |
67 | ARTHUR: Well, what's that then? | |
68 | BLACK KNIGHT: I've had worse. | |
69 | The Quest for the Holy Grail (Monty Python) | |
70 | ||
71 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
72 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
73 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
74 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |