]>
Commit | Line | Data |
---|---|---|
c6060300 MT |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.191 | |
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.191 | |
11 | Problem: Still some RISC OS stuff to remove. | |
12 | Solution: Remove files and lines. (Hong Xu) | |
13 | Remove the 'osfiletype' option code. | |
14 | Files: README_extra.txt, src/Make_ro.mak, src/INSTALL, src/Makefile, | |
15 | src/buffer.c, src/eval.c, src/feature.h, src/option.c, | |
16 | src/option.h, src/structs.h, src/version.c, src/pty.c, Filelist | |
17 | ||
18 | ||
19 | *** ../vim-7.3.190/README_extra.txt 2010-08-15 21:57:32.000000000 +0200 | |
20 | --- README_extra.txt 2011-05-19 12:35:16.000000000 +0200 | |
21 | *************** | |
22 | *** 13,21 **** | |
23 | ||
24 | src/os_amiga.* Files for the Amiga port. | |
25 | ||
26 | - src/gui_riscos.* | |
27 | - src/os_riscos.* Files for the RISC OS port. | |
28 | - | |
29 | src/gui_beos.* | |
30 | src/os_beos.* Files for the BeOS port. | |
31 | ||
32 | --- 13,18 ---- | |
33 | *** ../vim-7.3.190/src/Make_ro.mak 2010-08-15 21:57:27.000000000 +0200 | |
34 | --- src/Make_ro.mak 1970-01-01 01:00:00.000000000 +0100 | |
35 | *************** | |
36 | *** 1,135 **** | |
37 | - # | |
38 | - # Makefile for Vim on RISC OS - Andy Wingate | |
39 | - # | |
40 | - | |
41 | - GCC = gcc -mthrowback | |
42 | - CFLAGS = -DRISCOS -DFEAT_GUI | |
43 | - CC = $(GCC) $(CFLAGS) -O2 | |
44 | - # -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c | |
45 | - | |
46 | - TERMFLAG = -DUP_BC_PC_EXTERN | |
47 | - | |
48 | - ASMFLAGS = -throwback -objasm -gcc | |
49 | - | |
50 | - OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \ | |
51 | - o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \ | |
52 | - o.hardcopy o.hashtab o.main o.mark o.mbyte \ | |
53 | - o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \ | |
54 | - o.normal o.ops o.option o.popupmnu o.quickfix o.regexp o.screen \ | |
55 | - o.search \ | |
56 | - o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version \ | |
57 | - o.window o.os_riscos o.swis o.gui o.gui_riscos | |
58 | - | |
59 | - Vim: $(OBJS) | |
60 | - $(GCC) -o Vim $(OBJS) | |
61 | - | |
62 | - install: Vim | |
63 | - squeeze -v Vim @.!Vim.Vim | |
64 | - | |
65 | - clean: | |
66 | - create o.!fake! 0 | |
67 | - wipe o.* ~cf | |
68 | - remove Vim | |
69 | - | |
70 | - o.swis: s.swis | |
71 | - as $(ASMFLAGS) -o o.swis s.swis | |
72 | - | |
73 | - # Rules for object files | |
74 | - | |
75 | - o.%: c.% | |
76 | - $(CC) -c $< -o $@ | |
77 | - | |
78 | - o.buffer: c.buffer | |
79 | - | |
80 | - o.charset: c.charset | |
81 | - | |
82 | - o.digraph: c.digraph | |
83 | - | |
84 | - o.diff: c.diff | |
85 | - | |
86 | - o.edit: c.edit | |
87 | - | |
88 | - o.eval: c.eval | |
89 | - | |
90 | - o.ex_cmds: c.ex_cmds | |
91 | - | |
92 | - o.ex_cmds2: c.ex_cmds2 | |
93 | - | |
94 | - o.ex_docmd: c.ex_docmd | |
95 | - | |
96 | - o.ex_eval: c.ex_eval | |
97 | - | |
98 | - o.ex_getln: c.ex_getln | |
99 | - | |
100 | - o.fileio: c.fileio | |
101 | - | |
102 | - o.fold: c.fold | |
103 | - | |
104 | - o.getchar: c.getchar | |
105 | - | |
106 | - o.hardcopy: c.hardcopy | |
107 | - | |
108 | - o.hashtab: c.hashtab | |
109 | - | |
110 | - o.gui: c.gui | |
111 | - | |
112 | - o.gui_riscos: c.gui_riscos | |
113 | - | |
114 | - o.main: c.main | |
115 | - | |
116 | - o.mark: c.mark | |
117 | - | |
118 | - o.mbyte: c.mbyte | |
119 | - | |
120 | - o.memfile: c.memfile | |
121 | - | |
122 | - o.memline: c.memline | |
123 | - | |
124 | - o.menu: c.menu | |
125 | - | |
126 | - o.message: c.message | |
127 | - | |
128 | - o.misc1: c.misc1 | |
129 | - | |
130 | - o.misc2: c.misc2 | |
131 | - | |
132 | - o.move: c.move | |
133 | - | |
134 | - o.normal: c.normal | |
135 | - | |
136 | - o.ops: c.ops | |
137 | - | |
138 | - o.option: c.option | |
139 | - | |
140 | - o.os_riscos: c.os_riscos | |
141 | - | |
142 | - o.pty: c.pty | |
143 | - | |
144 | - o.popupmnu: c.popupmnu | |
145 | - | |
146 | - o.quickfix: c.quickfix | |
147 | - | |
148 | - o.regexp: c.regexp | |
149 | - | |
150 | - o.screen: c.screen | |
151 | - | |
152 | - o.search: c.search | |
153 | - | |
154 | - o.spell: c.spell | |
155 | - | |
156 | - o.syntax: c.syntax | |
157 | - | |
158 | - o.tag: c.tag | |
159 | - | |
160 | - o.term: c.term | |
161 | - $(CC) $(TERMFLAG) -c c.term -o o.term | |
162 | - | |
163 | - o.termlib: c.termlib | |
164 | - | |
165 | - o.ui: c.ui | |
166 | - | |
167 | - o.undo: c.undo | |
168 | - | |
169 | - o.version: c.version | |
170 | - | |
171 | - o.window: c.window | |
172 | --- 0 ---- | |
173 | *** ../vim-7.3.190/src/INSTALL 2010-08-15 21:57:28.000000000 +0200 | |
174 | --- src/INSTALL 2011-05-19 12:36:17.000000000 +0200 | |
175 | *************** | |
176 | *** 6,14 **** | |
177 | Contents: | |
178 | 1. Generic | |
179 | 2. Unix | |
180 | ! 3. RISC OS | |
181 | ! 4. OS/2 (with EMX 0.9b) | |
182 | ! 5. Atari MiNT | |
183 | ||
184 | See INSTALLami.txt for Amiga | |
185 | See INSTALLmac.txt for Macintosh | |
186 | --- 6,13 ---- | |
187 | Contents: | |
188 | 1. Generic | |
189 | 2. Unix | |
190 | ! 3. OS/2 (with EMX 0.9b) | |
191 | ! 4. Atari MiNT | |
192 | ||
193 | See INSTALLami.txt for Amiga | |
194 | See INSTALLmac.txt for Macintosh | |
195 | *************** | |
196 | *** 174,198 **** | |
197 | ./configure --without-local-dir | |
198 | ||
199 | ||
200 | ! 3. RISC OS | |
201 | ! ============= | |
202 | ! | |
203 | ! Much file renaming is needed before you can compile anything. | |
204 | ! You'll need UnixLib to link against, GCC and GNU make. | |
205 | ! | |
206 | ! I suggest you get the RISC OS binary distribution, which includes the | |
207 | ! Templates file and the loader. | |
208 | ! | |
209 | ! Try here: http://www.ecs.soton.ac.uk/~tal197 | |
210 | ! | |
211 | ! Do | |
212 | ! :help riscos | |
213 | ! | |
214 | ! within the editor for more information, or read the | |
215 | ! ../runtime/doc/os_risc.txt help file. | |
216 | ! | |
217 | ! | |
218 | ! 4. OS/2 | |
219 | ======= | |
220 | ||
221 | Summary: | |
222 | --- 173,179 ---- | |
223 | ./configure --without-local-dir | |
224 | ||
225 | ||
226 | ! 3. OS/2 | |
227 | ======= | |
228 | ||
229 | Summary: | |
230 | *************** | |
231 | *** 237,243 **** | |
232 | Check ../runtime/doc/os_os2.txt for additional info on running Vim. | |
233 | ||
234 | ||
235 | ! 5. Atari MiNT | |
236 | ============= | |
237 | ||
238 | [NOTE: this is quite old, it might not work anymore] | |
239 | --- 218,224 ---- | |
240 | Check ../runtime/doc/os_os2.txt for additional info on running Vim. | |
241 | ||
242 | ||
243 | ! 4. Atari MiNT | |
244 | ============= | |
245 | ||
246 | [NOTE: this is quite old, it might not work anymore] | |
247 | *** ../vim-7.3.190/src/Makefile 2011-04-01 13:05:37.000000000 +0200 | |
248 | --- src/Makefile 2011-05-19 12:37:52.000000000 +0200 | |
249 | *************** | |
250 | *** 29,35 **** | |
251 | # - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but | |
252 | # want to disable using X11 libraries. This speeds up starting Vim, | |
253 | # but the window title will not be set and the X11 selection can not | |
254 | ! # used. | |
255 | # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the | |
256 | # X11 Session Management Protocol (XSMP) library (libSM) but do not | |
257 | # want to use it. | |
258 | --- 29,35 ---- | |
259 | # - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but | |
260 | # want to disable using X11 libraries. This speeds up starting Vim, | |
261 | # but the window title will not be set and the X11 selection can not | |
262 | ! # be used. | |
263 | # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the | |
264 | # X11 Session Management Protocol (XSMP) library (libSM) but do not | |
265 | # want to use it. | |
266 | *************** | |
267 | *** 730,741 **** | |
268 | ### USL for Unix Systems Laboratories (SYSV 4.2) | |
269 | #EXTRA_DEFS = -DUSL | |
270 | ||
271 | - ### RISCos on MIPS without X11 | |
272 | - #EXTRA_DEFS = -DMIPS | |
273 | - | |
274 | - ### RISCos on MIPS with X11 | |
275 | - #EXTRA_LIBS = -lsun | |
276 | - | |
277 | ### (6) A/UX 3.1.1 with gcc (Jim Jagielski) | |
278 | #CC= gcc -D_POSIX_SOURCE | |
279 | #CFLAGS= -O2 | |
280 | --- 730,735 ---- | |
281 | *************** | |
282 | *** 1633,1639 **** | |
283 | RSRC_DIR = os_mac_rsrc | |
284 | ||
285 | PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \ | |
286 | ! os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO) | |
287 | ||
288 | # Default target is making the executable and tools | |
289 | all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE) | |
290 | --- 1627,1633 ---- | |
291 | RSRC_DIR = os_mac_rsrc | |
292 | ||
293 | PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \ | |
294 | ! os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO) | |
295 | ||
296 | # Default target is making the executable and tools | |
297 | all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE) | |
298 | *** ../vim-7.3.190/src/buffer.c 2011-05-05 17:32:40.000000000 +0200 | |
299 | --- src/buffer.c 2011-05-19 13:09:25.000000000 +0200 | |
300 | *************** | |
301 | *** 1808,1816 **** | |
302 | #ifdef FEAT_AUTOCMD | |
303 | clear_string_option(&buf->b_p_ft); | |
304 | #endif | |
305 | - #ifdef FEAT_OSFILETYPE | |
306 | - clear_string_option(&buf->b_p_oft); | |
307 | - #endif | |
308 | #ifdef FEAT_CINDENT | |
309 | clear_string_option(&buf->b_p_cink); | |
310 | clear_string_option(&buf->b_p_cino); | |
311 | --- 1808,1813 ---- | |
312 | *** ../vim-7.3.190/src/eval.c 2011-05-10 16:41:13.000000000 +0200 | |
313 | --- src/eval.c 2011-05-19 13:09:43.000000000 +0200 | |
314 | *************** | |
315 | *** 12076,12084 **** | |
316 | #ifdef FEAT_OLE | |
317 | "ole", | |
318 | #endif | |
319 | - #ifdef FEAT_OSFILETYPE | |
320 | - "osfiletype", | |
321 | - #endif | |
322 | #ifdef FEAT_PATH_EXTRA | |
323 | "path_extra", | |
324 | #endif | |
325 | --- 12076,12081 ---- | |
326 | *** ../vim-7.3.190/src/feature.h 2010-08-15 21:57:31.000000000 +0200 | |
327 | --- src/feature.h 2011-05-19 13:09:56.000000000 +0200 | |
328 | *************** | |
329 | *** 506,520 **** | |
330 | #endif | |
331 | ||
332 | /* | |
333 | - * +osfiletype filetype checking in autocommand patterns. | |
334 | - * Only on systems that support filetypes (RISC OS). | |
335 | - */ | |
336 | - #if 0 | |
337 | - # define FEAT_OSFILETYPE | |
338 | - # define DFLT_OFT "Text" | |
339 | - #endif | |
340 | - | |
341 | - /* | |
342 | * +viminfo reading/writing the viminfo file. Takes about 8Kbyte | |
343 | * of code. | |
344 | * VIMINFO_FILE Location of user .viminfo file (should start with $). | |
345 | --- 506,511 ---- | |
346 | *** ../vim-7.3.190/src/option.c 2011-04-28 17:24:54.000000000 +0200 | |
347 | --- src/option.c 2011-05-19 13:11:42.000000000 +0200 | |
348 | *************** | |
349 | *** 140,148 **** | |
350 | #define PV_MOD OPT_BUF(BV_MOD) | |
351 | #define PV_MPS OPT_BUF(BV_MPS) | |
352 | #define PV_NF OPT_BUF(BV_NF) | |
353 | - #ifdef FEAT_OSFILETYPE | |
354 | - # define PV_OFT OPT_BUF(BV_OFT) | |
355 | - #endif | |
356 | #ifdef FEAT_COMPL_FUNC | |
357 | # define PV_OFU OPT_BUF(BV_OFU) | |
358 | #endif | |
359 | --- 140,145 ---- | |
360 | *************** | |
361 | *** 337,345 **** | |
362 | static int p_mod; | |
363 | static char_u *p_mps; | |
364 | static char_u *p_nf; | |
365 | - #ifdef FEAT_OSFILETYPE | |
366 | - static char_u *p_oft; | |
367 | - #endif | |
368 | static int p_pi; | |
369 | #ifdef FEAT_TEXTOBJ | |
370 | static char_u *p_qe; | |
371 | --- 334,339 ---- | |
372 | *************** | |
373 | *** 1901,1914 **** | |
374 | (char_u *)NULL, PV_NONE, | |
375 | {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, | |
376 | {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, | |
377 | - #ifdef FEAT_OSFILETYPE | |
378 | - (char_u *)&p_oft, PV_OFT, | |
379 | - {(char_u *)DFLT_OFT, (char_u *)0L} | |
380 | - #else | |
381 | (char_u *)NULL, PV_NONE, | |
382 | ! {(char_u *)0L, (char_u *)0L} | |
383 | ! #endif | |
384 | ! SCRIPTID_INIT}, | |
385 | {"paragraphs", "para", P_STRING|P_VI_DEF, | |
386 | (char_u *)&p_para, PV_NONE, | |
387 | {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", | |
388 | --- 1895,1902 ---- | |
389 | (char_u *)NULL, PV_NONE, | |
390 | {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, | |
391 | {"osfiletype", "oft", P_STRING|P_ALLOCED|P_VI_DEF, | |
392 | (char_u *)NULL, PV_NONE, | |
393 | ! {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, | |
394 | {"paragraphs", "para", P_STRING|P_VI_DEF, | |
395 | (char_u *)&p_para, PV_NONE, | |
396 | {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp", | |
397 | *************** | |
398 | *** 5282,5290 **** | |
399 | #ifdef FEAT_AUTOCMD | |
400 | check_string_option(&buf->b_p_ft); | |
401 | #endif | |
402 | - #ifdef FEAT_OSFILETYPE | |
403 | - check_string_option(&buf->b_p_oft); | |
404 | - #endif | |
405 | #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
406 | check_string_option(&buf->b_p_cinw); | |
407 | #endif | |
408 | --- 5270,5275 ---- | |
409 | *************** | |
410 | *** 9665,9673 **** | |
411 | case PV_MA: return (char_u *)&(curbuf->b_p_ma); | |
412 | case PV_MOD: return (char_u *)&(curbuf->b_changed); | |
413 | case PV_NF: return (char_u *)&(curbuf->b_p_nf); | |
414 | - #ifdef FEAT_OSFILETYPE | |
415 | - case PV_OFT: return (char_u *)&(curbuf->b_p_oft); | |
416 | - #endif | |
417 | case PV_PI: return (char_u *)&(curbuf->b_p_pi); | |
418 | #ifdef FEAT_TEXTOBJ | |
419 | case PV_QE: return (char_u *)&(curbuf->b_p_qe); | |
420 | --- 9650,9655 ---- | |
421 | *************** | |
422 | *** 10018,10026 **** | |
423 | /* Don't copy 'filetype', it must be detected */ | |
424 | buf->b_p_ft = empty_option; | |
425 | #endif | |
426 | - #ifdef FEAT_OSFILETYPE | |
427 | - buf->b_p_oft = vim_strsave(p_oft); | |
428 | - #endif | |
429 | buf->b_p_pi = p_pi; | |
430 | #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
431 | buf->b_p_cinw = vim_strsave(p_cinw); | |
432 | --- 10000,10005 ---- | |
433 | *** ../vim-7.3.190/src/option.h 2011-02-12 13:59:55.000000000 +0100 | |
434 | --- src/option.h 2011-05-19 13:11:46.000000000 +0200 | |
435 | *************** | |
436 | *** 984,992 **** | |
437 | , BV_MOD | |
438 | , BV_MPS | |
439 | , BV_NF | |
440 | - #ifdef FEAT_OSFILETYPE | |
441 | - , BV_OFT | |
442 | - #endif | |
443 | #ifdef FEAT_COMPL_FUNC | |
444 | , BV_OFU | |
445 | #endif | |
446 | --- 984,989 ---- | |
447 | *** ../vim-7.3.190/src/structs.h 2011-05-10 16:41:13.000000000 +0200 | |
448 | --- src/structs.h 2011-05-19 13:11:58.000000000 +0200 | |
449 | *************** | |
450 | *** 1530,1538 **** | |
451 | int b_p_ml_nobin; /* b_p_ml saved for binary mode */ | |
452 | int b_p_ma; /* 'modifiable' */ | |
453 | char_u *b_p_nf; /* 'nrformats' */ | |
454 | - #ifdef FEAT_OSFILETYPE | |
455 | - char_u *b_p_oft; /* 'osfiletype' */ | |
456 | - #endif | |
457 | int b_p_pi; /* 'preserveindent' */ | |
458 | #ifdef FEAT_TEXTOBJ | |
459 | char_u *b_p_qe; /* 'quoteescape' */ | |
460 | --- 1530,1535 ---- | |
461 | *** ../vim-7.3.190/src/version.c 2011-05-19 12:14:03.000000000 +0200 | |
462 | --- src/version.c 2011-05-19 13:26:42.000000000 +0200 | |
463 | *************** | |
464 | *** 426,436 **** | |
465 | "-ole", | |
466 | # endif | |
467 | #endif | |
468 | - #ifdef FEAT_OSFILETYPE | |
469 | - "+osfiletype", | |
470 | - #else | |
471 | - "-osfiletype", | |
472 | - #endif | |
473 | #ifdef FEAT_PATH_EXTRA | |
474 | "+path_extra", | |
475 | #else | |
476 | --- 426,431 ---- | |
477 | *** ../vim-7.3.190/src/pty.c 2011-04-11 14:24:33.000000000 +0200 | |
478 | --- src/pty.c 2011-05-19 12:43:26.000000000 +0200 | |
479 | *************** | |
480 | *** 123,130 **** | |
481 | static void initmaster __ARGS((int)); | |
482 | ||
483 | /* | |
484 | ! * Open all ptys with O_NOCTTY, just to be on the safe side | |
485 | ! * (RISCos mips breaks otherwise) | |
486 | */ | |
487 | #ifndef O_NOCTTY | |
488 | # define O_NOCTTY 0 | |
489 | --- 123,129 ---- | |
490 | static void initmaster __ARGS((int)); | |
491 | ||
492 | /* | |
493 | ! * Open all ptys with O_NOCTTY, just to be on the safe side. | |
494 | */ | |
495 | #ifndef O_NOCTTY | |
496 | # define O_NOCTTY 0 | |
497 | *** ../vim-7.3.190/Filelist 2011-05-10 17:21:34.000000000 +0200 | |
498 | --- Filelist 2011-05-19 13:37:25.000000000 +0200 | |
499 | *************** | |
500 | *** 427,433 **** | |
501 | $(SRC_VMS) \ | |
502 | README_os390.txt \ | |
503 | src/Make_mint.mak \ | |
504 | - src/Make_ro.mak \ | |
505 | src/if_sniff.c \ | |
506 | src/infplist.xml \ | |
507 | src/link.390 \ | |
508 | --- 427,432 ---- | |
509 | *** ../vim-7.3.190/src/version.c 2011-05-19 12:14:03.000000000 +0200 | |
510 | --- src/version.c 2011-05-19 13:26:42.000000000 +0200 | |
511 | *************** | |
512 | *** 716,717 **** | |
513 | --- 711,714 ---- | |
514 | { /* Add new patch number below this line */ | |
515 | + /**/ | |
516 | + 191, | |
517 | /**/ | |
518 | ||
519 | -- | |
520 | From "know your smileys": | |
521 | :-& Eating spaghetti | |
522 | ||
523 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
524 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
525 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
526 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |