1 To: [email protected] |
|
2 Subject: Patch 7.2.320 |
|
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.320 |
|
11 Problem: Unused function in Mzscheme interface. |
|
12 Solution: Remove the function and what depends on it. (Dominique Pelle) |
|
13 Files: src/if_mzsch.c, src/proto/if_mzsch.pro |
|
14 |
|
15 |
|
16 *** ../vim-7.2.319/src/if_mzsch.c 2009-09-11 12:20:47.000000000 +0200 |
|
17 --- src/if_mzsch.c 2009-12-16 19:01:04.000000000 +0100 |
|
18 *************** |
|
19 *** 70,83 **** |
|
20 Scheme_Object *port; |
|
21 } Port_Info; |
|
22 |
|
23 - /* info for do_apply */ |
|
24 - typedef struct |
|
25 - { |
|
26 - Scheme_Object *proc; |
|
27 - int argc; |
|
28 - Scheme_Object **argv; |
|
29 - } Apply_Info; |
|
30 - |
|
31 /* |
|
32 *======================================================================== |
|
33 * Vim-Control Commands |
|
34 --- 70,75 ---- |
|
35 *************** |
|
36 *** 160,166 **** |
|
37 static Scheme_Object *extract_exn_message(Scheme_Object *v); |
|
38 static Scheme_Object *do_eval(void *, int noargc, Scheme_Object **noargv); |
|
39 static Scheme_Object *do_load(void *, int noargc, Scheme_Object **noargv); |
|
40 - static Scheme_Object *do_apply(void *, int noargc, Scheme_Object **noargv); |
|
41 static void register_vim_exn(void); |
|
42 static vim_mz_buffer *get_buffer_arg(const char *fname, int argnum, |
|
43 int argc, Scheme_Object **argv); |
|
44 --- 152,157 ---- |
|
45 *************** |
|
46 *** 1056,1062 **** |
|
47 MZ_GC_REG(); |
|
48 config = scheme_config; |
|
49 MZ_GC_CHECK(); |
|
50 ! /* recreate ports each call effectivelly clearing these ones */ |
|
51 curout = scheme_make_string_output_port(); |
|
52 MZ_GC_CHECK(); |
|
53 curerr = scheme_make_string_output_port(); |
|
54 --- 1047,1053 ---- |
|
55 MZ_GC_REG(); |
|
56 config = scheme_config; |
|
57 MZ_GC_CHECK(); |
|
58 ! /* recreate ports each call effectively clearing these ones */ |
|
59 curout = scheme_make_string_output_port(); |
|
60 MZ_GC_CHECK(); |
|
61 curerr = scheme_make_string_output_port(); |
|
62 *************** |
|
63 *** 1196,1231 **** |
|
64 } |
|
65 } |
|
66 |
|
67 - /* |
|
68 - * apply MzScheme procedure with arguments, |
|
69 - * handling errors |
|
70 - */ |
|
71 - Scheme_Object * |
|
72 - mzvim_apply(Scheme_Object *proc, int argc, Scheme_Object **argv) |
|
73 - { |
|
74 - if (mzscheme_init()) |
|
75 - return FAIL; |
|
76 - else |
|
77 - { |
|
78 - Apply_Info data = {NULL, 0, NULL}; |
|
79 - Scheme_Object *ret = NULL; |
|
80 - |
|
81 - MZ_GC_DECL_REG(5); |
|
82 - MZ_GC_VAR_IN_REG(0, ret); |
|
83 - MZ_GC_VAR_IN_REG(1, data.proc); |
|
84 - MZ_GC_ARRAY_VAR_IN_REG(2, data.argv, argc); |
|
85 - MZ_GC_REG(); |
|
86 - |
|
87 - data.proc = proc; |
|
88 - data.argc = argc; |
|
89 - data.argv = argv; |
|
90 - |
|
91 - eval_with_exn_handling(&data, do_apply, &ret); |
|
92 - MZ_GC_UNREG(); |
|
93 - return ret; |
|
94 - } |
|
95 - } |
|
96 - |
|
97 static Scheme_Object * |
|
98 do_load(void *data, int noargc, Scheme_Object **noargv) |
|
99 { |
|
100 --- 1187,1192 ---- |
|
101 *************** |
|
102 *** 1257,1263 **** |
|
103 MZ_GC_CHECK(); |
|
104 } |
|
105 |
|
106 ! /* errors will be caught in do_mzscheme_comamnd and ex_mzfile */ |
|
107 scheme_close_input_port(pinfo->port); |
|
108 MZ_GC_CHECK(); |
|
109 pinfo->port = NULL; |
|
110 --- 1218,1224 ---- |
|
111 MZ_GC_CHECK(); |
|
112 } |
|
113 |
|
114 ! /* errors will be caught in do_mzscheme_command and ex_mzfile */ |
|
115 scheme_close_input_port(pinfo->port); |
|
116 MZ_GC_CHECK(); |
|
117 pinfo->port = NULL; |
|
118 *************** |
|
119 *** 1348,1360 **** |
|
120 return scheme_eval_string_all((char *)s, environment, TRUE); |
|
121 } |
|
122 |
|
123 - static Scheme_Object * |
|
124 - do_apply(void *a, int noargc, Scheme_Object **noargv) |
|
125 - { |
|
126 - Apply_Info *info = (Apply_Info *)a; |
|
127 - return scheme_apply(info->proc, info->argc, info->argv); |
|
128 - } |
|
129 - |
|
130 /* |
|
131 *======================================================================== |
|
132 * 3. MzScheme I/O Handlers |
|
133 --- 1309,1314 ---- |
|
134 *************** |
|
135 *** 2128,2134 **** |
|
136 static Scheme_Object * |
|
137 set_buffer_line(void *data, int argc, Scheme_Object **argv) |
|
138 { |
|
139 ! /* First of all, we check the the of the supplied MzScheme object. |
|
140 * There are three cases: |
|
141 * 1. #f - this is a deletion. |
|
142 * 2. A string - this is a replacement. |
|
143 --- 2082,2088 ---- |
|
144 static Scheme_Object * |
|
145 set_buffer_line(void *data, int argc, Scheme_Object **argv) |
|
146 { |
|
147 ! /* First of all, we check the value of the supplied MzScheme object. |
|
148 * There are three cases: |
|
149 * 1. #f - this is a deletion. |
|
150 * 2. A string - this is a replacement. |
|
151 *************** |
|
152 *** 2428,2434 **** |
|
153 /* |
|
154 * (insert-buff-line-list {linenr} {string/string-list} [buffer]) |
|
155 * |
|
156 ! * Insert a number of lines into the specified buffer after the specifed line. |
|
157 * The line number is in Vim format (1-based). The lines to be inserted are |
|
158 * given as an MzScheme list of string objects or as a single string. The lines |
|
159 * to be added are checked for validity and correct format. Errors are |
|
160 --- 2382,2388 ---- |
|
161 /* |
|
162 * (insert-buff-line-list {linenr} {string/string-list} [buffer]) |
|
163 * |
|
164 ! * Insert a number of lines into the specified buffer after the specified line. |
|
165 * The line number is in Vim format (1-based). The lines to be inserted are |
|
166 * given as an MzScheme list of string objects or as a single string. The lines |
|
167 * to be added are checked for validity and correct format. Errors are |
|
168 *** ../vim-7.2.319/src/proto/if_mzsch.pro 2009-05-26 22:58:43.000000000 +0200 |
|
169 --- src/proto/if_mzsch.pro 2009-12-16 19:01:01.000000000 +0100 |
|
170 *************** |
|
171 *** 13,20 **** |
|
172 void mzvim_check_threads __ARGS((void)); |
|
173 void mzvim_reset_timer __ARGS((void)); |
|
174 void *mzvim_eval_string __ARGS((char_u *str)); |
|
175 - struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc, |
|
176 - struct Scheme_Object **)); |
|
177 int mzthreads_allowed __ARGS((void)); |
|
178 void mzscheme_main __ARGS((void)); |
|
179 /* vim: set ft=c : */ |
|
180 --- 13,18 ---- |
|
181 *** ../vim-7.2.319/src/version.c 2009-12-16 18:49:09.000000000 +0100 |
|
182 --- src/version.c 2009-12-16 18:53:48.000000000 +0100 |
|
183 *************** |
|
184 *** 683,684 **** |
|
185 --- 683,686 ---- |
|
186 { /* Add new patch number below this line */ |
|
187 + /**/ |
|
188 + 320, |
|
189 /**/ |
|
190 |
|
191 -- |
|
192 hundred-and-one symptoms of being an internet addict: |
|
193 38. You wake up at 3 a.m. to go to the bathroom and stop and check your e-mail |
|
194 on the way back to bed. |
|
195 |
|
196 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
197 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
198 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
199 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|