1 To: vim_dev@googlegroups.com
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
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
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
24 src/os_amiga.* Files for the Amiga port.
27 - src/os_riscos.* Files for the RISC OS port.
30 src/os_beos.* Files for the BeOS port.
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
38 - # Makefile for Vim on RISC OS - Andy Wingate
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
46 - TERMFLAG = -DUP_BC_PC_EXTERN
48 - ASMFLAGS = -throwback -objasm -gcc
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 \
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
60 - $(GCC) -o Vim $(OBJS)
63 - squeeze -v Vim @.!Vim.Vim
71 - as $(ASMFLAGS) -o o.swis s.swis
73 - # Rules for object files
80 - o.charset: c.charset
82 - o.digraph: c.digraph
90 - o.ex_cmds: c.ex_cmds
92 - o.ex_cmds2: c.ex_cmds2
94 - o.ex_docmd: c.ex_docmd
96 - o.ex_eval: c.ex_eval
98 - o.ex_getln: c.ex_getln
104 - o.getchar: c.getchar
106 - o.hardcopy: c.hardcopy
108 - o.hashtab: c.hashtab
112 - o.gui_riscos: c.gui_riscos
120 - o.memfile: c.memfile
122 - o.memline: c.memline
126 - o.message: c.message
140 - o.os_riscos: c.os_riscos
144 - o.popupmnu: c.popupmnu
146 - o.quickfix: c.quickfix
161 - $(CC) $(TERMFLAG) -c c.term -o o.term
163 - o.termlib: c.termlib
169 - o.version: c.version
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
181 ! 4. OS/2 (with EMX 0.9b)
184 See INSTALLami.txt for Amiga
185 See INSTALLmac.txt for Macintosh
190 ! 3. OS/2 (with EMX 0.9b)
193 See INSTALLami.txt for Amiga
194 See INSTALLmac.txt for Macintosh
197 ./configure --without-local-dir
203 ! Much file renaming is needed before you can compile anything.
204 ! You'll need UnixLib to link against, GCC and GNU make.
206 ! I suggest you get the RISC OS binary distribution, which includes the
207 ! Templates file and the loader.
209 ! Try here: http://www.ecs.soton.ac.uk/~tal197
214 ! within the editor for more information, or read the
215 ! ../runtime/doc/os_risc.txt help file.
223 ./configure --without-local-dir
232 Check ../runtime/doc/os_os2.txt for additional info on running Vim.
238 [NOTE: this is quite old, it might not work anymore]
240 Check ../runtime/doc/os_os2.txt for additional info on running Vim.
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
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
255 # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
256 # X11 Session Management Protocol (XSMP) library (libSM) but do not
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
263 # - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
264 # X11 Session Management Protocol (XSMP) library (libSM) but do not
268 ### USL for Unix Systems Laboratories (SYSV 4.2)
271 - ### RISCos on MIPS without X11
272 - #EXTRA_DEFS = -DMIPS
274 - ### RISCos on MIPS with X11
275 - #EXTRA_LIBS = -lsun
277 ### (6) A/UX 3.1.1 with gcc (Jim Jagielski)
278 #CC= gcc -D_POSIX_SOURCE
283 RSRC_DIR = os_mac_rsrc
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)
288 # Default target is making the executable and tools
289 all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
291 RSRC_DIR = os_mac_rsrc
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)
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
303 clear_string_option(&buf->b_p_ft);
305 - #ifdef FEAT_OSFILETYPE
306 - clear_string_option(&buf->b_p_oft);
309 clear_string_option(&buf->b_p_cink);
310 clear_string_option(&buf->b_p_cino);
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
319 - #ifdef FEAT_OSFILETYPE
322 #ifdef FEAT_PATH_EXTRA
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
333 - * +osfiletype filetype checking in autocommand patterns.
334 - * Only on systems that support filetypes (RISC OS).
337 - # define FEAT_OSFILETYPE
338 - # define DFLT_OFT "Text"
342 * +viminfo reading/writing the viminfo file. Takes about 8Kbyte
344 * VIMINFO_FILE Location of user .viminfo file (should start with $).
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
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)
356 #ifdef FEAT_COMPL_FUNC
357 # define PV_OFU OPT_BUF(BV_OFU)
363 static char_u *p_mps;
365 - #ifdef FEAT_OSFILETYPE
366 - static char_u *p_oft;
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}
381 (char_u *)NULL, PV_NONE,
382 ! {(char_u *)0L, (char_u *)0L}
385 {"paragraphs", "para", P_STRING|P_VI_DEF,
386 (char_u *)&p_para, PV_NONE,
387 {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
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",
400 check_string_option(&buf->b_p_ft);
402 - #ifdef FEAT_OSFILETYPE
403 - check_string_option(&buf->b_p_oft);
405 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
406 check_string_option(&buf->b_p_cinw);
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);
417 case PV_PI: return (char_u *)&(curbuf->b_p_pi);
419 case PV_QE: return (char_u *)&(curbuf->b_p_qe);
423 /* Don't copy 'filetype', it must be detected */
424 buf->b_p_ft = empty_option;
426 - #ifdef FEAT_OSFILETYPE
427 - buf->b_p_oft = vim_strsave(p_oft);
430 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
431 buf->b_p_cinw = vim_strsave(p_cinw);
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
440 - #ifdef FEAT_OSFILETYPE
443 #ifdef FEAT_COMPL_FUNC
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
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' */
457 int b_p_pi; /* 'preserveindent' */
459 char_u *b_p_qe; /* 'quoteescape' */
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
468 - #ifdef FEAT_OSFILETYPE
473 #ifdef FEAT_PATH_EXTRA
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
481 static void initmaster __ARGS((int));
484 ! * Open all ptys with O_NOCTTY, just to be on the safe side
485 ! * (RISCos mips breaks otherwise)
490 static void initmaster __ARGS((int));
493 ! * Open all ptys with O_NOCTTY, just to be on the safe side.
497 *** ../vim-7.3.190/Filelist 2011-05-10 17:21:34.000000000 +0200
498 --- Filelist 2011-05-19 13:37:25.000000000 +0200
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
514 { /* Add new patch number below this line */
520 From "know your smileys":
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 ///