|
1 To: [email protected] |
|
2 Subject: Patch 7.2.289 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.289 |
|
11 Problem: Checking wrong struct member. |
|
12 Solution: Change tb_buf to tb_noremap. (Dominique Pelle) |
|
13 Files: src/getchar.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.288/src/getchar.c 2009-09-30 15:15:33.000000000 +0200 |
|
17 --- src/getchar.c 2009-11-11 12:50:58.000000000 +0100 |
|
18 *************** |
|
19 *** 22,28 **** |
|
20 * These buffers are used for storing: |
|
21 * - stuffed characters: A command that is translated into another command. |
|
22 * - redo characters: will redo the last change. |
|
23 ! * - recorded chracters: for the "q" command. |
|
24 * |
|
25 * The bytes are stored like in the typeahead buffer: |
|
26 * - K_SPECIAL introduces a special key (two more bytes follow). A literal |
|
27 --- 22,28 ---- |
|
28 * These buffers are used for storing: |
|
29 * - stuffed characters: A command that is translated into another command. |
|
30 * - redo characters: will redo the last change. |
|
31 ! * - recorded characters: for the "q" command. |
|
32 * |
|
33 * The bytes are stored like in the typeahead buffer: |
|
34 * - K_SPECIAL introduces a special key (two more bytes follow). A literal |
|
35 *************** |
|
36 *** 1283,1289 **** |
|
37 EMSG2(_(e_intern2), "Free typebuf 1"); |
|
38 else |
|
39 vim_free(typebuf.tb_buf); |
|
40 ! if (typebuf.tb_buf == noremapbuf_init) |
|
41 EMSG2(_(e_intern2), "Free typebuf 2"); |
|
42 else |
|
43 vim_free(typebuf.tb_noremap); |
|
44 --- 1283,1289 ---- |
|
45 EMSG2(_(e_intern2), "Free typebuf 1"); |
|
46 else |
|
47 vim_free(typebuf.tb_buf); |
|
48 ! if (typebuf.tb_noremap == noremapbuf_init) |
|
49 EMSG2(_(e_intern2), "Free typebuf 2"); |
|
50 else |
|
51 vim_free(typebuf.tb_noremap); |
|
52 *************** |
|
53 *** 1516,1522 **** |
|
54 * wanted. |
|
55 * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte. |
|
56 * Collects the bytes of a multibyte character into the whole character. |
|
57 ! * Returns the modifers in the global "mod_mask". |
|
58 */ |
|
59 int |
|
60 vgetc() |
|
61 --- 1516,1522 ---- |
|
62 * wanted. |
|
63 * This translates escaped K_SPECIAL and CSI bytes to a K_SPECIAL or CSI byte. |
|
64 * Collects the bytes of a multibyte character into the whole character. |
|
65 ! * Returns the modifiers in the global "mod_mask". |
|
66 */ |
|
67 int |
|
68 vgetc() |
|
69 *************** |
|
70 *** 3320,3326 **** |
|
71 retval = 1; |
|
72 goto theend; |
|
73 } |
|
74 ! /* An abbrevation cannot contain white space. */ |
|
75 for (n = 0; n < len; ++n) |
|
76 if (vim_iswhite(keys[n])) |
|
77 { |
|
78 --- 3320,3326 ---- |
|
79 retval = 1; |
|
80 goto theend; |
|
81 } |
|
82 ! /* An abbreviation cannot contain white space. */ |
|
83 for (n = 0; n < len; ++n) |
|
84 if (vim_iswhite(keys[n])) |
|
85 { |
|
86 *************** |
|
87 *** 4272,4278 **** |
|
88 |
|
89 /* |
|
90 * Check for word before the cursor: If it ends in a keyword char all |
|
91 ! * chars before it must be al keyword chars or non-keyword chars, but not |
|
92 * white space. If it ends in a non-keyword char we accept any characters |
|
93 * before it except white space. |
|
94 */ |
|
95 --- 4272,4278 ---- |
|
96 |
|
97 /* |
|
98 * Check for word before the cursor: If it ends in a keyword char all |
|
99 ! * chars before it must be keyword chars or non-keyword chars, but not |
|
100 * white space. If it ends in a non-keyword char we accept any characters |
|
101 * before it except white space. |
|
102 */ |
|
103 *** ../vim-7.2.288/src/version.c 2009-11-11 15:06:59.000000000 +0100 |
|
104 --- src/version.c 2009-11-11 16:19:12.000000000 +0100 |
|
105 *************** |
|
106 *** 683,684 **** |
|
107 --- 683,686 ---- |
|
108 { /* Add new patch number below this line */ |
|
109 + /**/ |
|
110 + 289, |
|
111 /**/ |
|
112 |
|
113 -- |
|
114 A M00se once bit my sister ... |
|
115 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
|
116 |
|
117 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
118 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
119 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
120 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |