]>
Commit | Line | Data |
---|---|---|
17e7d110 SS |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.3.006 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.006 | |
11 | Problem: Can't build some multi-byte code with C89. | |
12 | Solution: Move code to after declarations. (Joachim Schmitz) | |
13 | Files: src/mbyte.c, src/spell.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.005/src/mbyte.c 2010-08-15 21:57:28.000000000 +0200 | |
17 | --- src/mbyte.c 2010-09-18 13:32:40.000000000 +0200 | |
18 | *************** | |
19 | *** 5167,5182 **** | |
20 | void | |
21 | xim_set_preedit() | |
22 | { | |
23 | - if (xic == NULL) | |
24 | - return; | |
25 | - | |
26 | - xim_set_focus(TRUE); | |
27 | - | |
28 | XVaNestedList attr_list; | |
29 | XRectangle spot_area; | |
30 | XPoint over_spot; | |
31 | int line_space; | |
32 | ||
33 | if (!xim_has_focus) | |
34 | { | |
35 | /* hide XIM cursor */ | |
36 | --- 5167,5182 ---- | |
37 | void | |
38 | xim_set_preedit() | |
39 | { | |
40 | XVaNestedList attr_list; | |
41 | XRectangle spot_area; | |
42 | XPoint over_spot; | |
43 | int line_space; | |
44 | ||
45 | + if (xic == NULL) | |
46 | + return; | |
47 | + | |
48 | + xim_set_focus(TRUE); | |
49 | + | |
50 | if (!xim_has_focus) | |
51 | { | |
52 | /* hide XIM cursor */ | |
53 | *************** | |
54 | *** 5554,5565 **** | |
55 | void | |
56 | xim_set_status_area() | |
57 | { | |
58 | - if (xic == NULL) | |
59 | - return; | |
60 | - | |
61 | XVaNestedList preedit_list = 0, status_list = 0, list = 0; | |
62 | XRectangle pre_area, status_area; | |
63 | ||
64 | if (input_style & XIMStatusArea) | |
65 | { | |
66 | if (input_style & XIMPreeditArea) | |
67 | --- 5554,5565 ---- | |
68 | void | |
69 | xim_set_status_area() | |
70 | { | |
71 | XVaNestedList preedit_list = 0, status_list = 0, list = 0; | |
72 | XRectangle pre_area, status_area; | |
73 | ||
74 | + if (xic == NULL) | |
75 | + return; | |
76 | + | |
77 | if (input_style & XIMStatusArea) | |
78 | { | |
79 | if (input_style & XIMPreeditArea) | |
80 | *** ../vim-7.3.005/src/spell.c 2010-08-15 21:57:32.000000000 +0200 | |
81 | --- src/spell.c 2010-09-18 13:34:11.000000000 +0200 | |
82 | *************** | |
83 | *** 4679,4685 **** | |
84 | buf_T *buf; | |
85 | char_u fname[MAXPATHL]; | |
86 | ||
87 | ! /* Go through all buffers and handle 'spelllang'. */ //<VN> | |
88 | for (buf = firstbuf; buf != NULL; buf = buf->b_next) | |
89 | ga_clear(&buf->b_s.b_langp); | |
90 | ||
91 | --- 4679,4685 ---- | |
92 | buf_T *buf; | |
93 | char_u fname[MAXPATHL]; | |
94 | ||
95 | ! /* Go through all buffers and handle 'spelllang'. <VN> */ | |
96 | for (buf = firstbuf; buf != NULL; buf = buf->b_next) | |
97 | ga_clear(&buf->b_s.b_langp); | |
98 | ||
99 | *** ../vim-7.3.005/src/version.c 2010-09-14 12:47:30.000000000 +0200 | |
100 | --- src/version.c 2010-09-18 13:34:23.000000000 +0200 | |
101 | *************** | |
102 | *** 716,717 **** | |
103 | --- 716,719 ---- | |
104 | { /* Add new patch number below this line */ | |
105 | + /**/ | |
106 | + 6, | |
107 | /**/ | |
108 | ||
109 | -- | |
110 | hundred-and-one symptoms of being an internet addict: | |
111 | 163. You go outside for the fresh air (at -30 degrees) but open the | |
112 | window first to hear new mail arrive. | |
113 | ||
114 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
115 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
116 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
117 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |