updated for version 7.3.191

Problem:    Still some RISC OS stuff to remove.
Solution:   Remove files and lines. (Hong Xu)
            Remove the 'osfiletype' option code.

diff --git a/Filelist b/Filelist
index 046be1a24af10dffa24c5e47dd069886a44d11a2..37822bcbc05a5e5dd47016757fc56a00d7cc4763 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -427,7 +427,6 @@ SRC_EXTRA = \
                $(SRC_VMS) \
                README_os390.txt \
                src/Make_mint.mak \
-               src/Make_ro.mak \
                src/if_sniff.c \
                src/infplist.xml \
                src/link.390 \

diff --git a/README_extra.txt b/README_extra.txt
index 68eebefcd15fccbffd28dcc63e9da050067ed377..2bbc0563d4cc2362f9a246ac16c52f2fa4d38d87 100644 (file)
--- a/README_extra.txt
+++ b/README_extra.txt
@@ -13,9 +13,6 @@ src/if_sniff.*                Interface to SNiFF.  If you don't know what SNiFF is,
 
 src/os_amiga.*         Files for the Amiga port.
 
-src/gui_riscos.*
-src/os_riscos.*                Files for the RISC OS port.
-
 src/gui_beos.*
 src/os_beos.*          Files for the BeOS port.
 

diff --git a/src/INSTALL b/src/INSTALL
index dd50e0dc26a0c5b327debca88400742f141e37f3..aa4b6e341c7cb9b2477cf01f44e451bb3c9b7a1d 100644 (file)
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -6,9 +6,8 @@ executable version of Vim, you don't need this.
 Contents:
 1. Generic
 2. Unix
-3. RISC OS
-4. OS/2 (with EMX 0.9b)
-5. Atari MiNT
+3. OS/2 (with EMX 0.9b)
+4. Atari MiNT
 
 See INSTALLami.txt              for Amiga
 See INSTALLmac.txt              for Macintosh
@@ -174,25 +173,7 @@ And to not search for locally installed headers and libraries at all, use:
        ./configure --without-local-dir
 
 
-3. RISC OS
-=============
-
-Much file renaming is needed before you can compile anything.
-You'll need UnixLib to link against, GCC and GNU make.
-
-I suggest you get the RISC OS binary distribution, which includes the
-Templates file and the loader.
-
-Try here: http://www.ecs.soton.ac.uk/~tal197
-
-Do
-    :help riscos
-
-within the editor for more information, or read the
-../runtime/doc/os_risc.txt help file.
-
-
-4. OS/2
+3. OS/2
 =======
 
 Summary:
@@ -237,7 +218,7 @@ Prerequisites:
 Check ../runtime/doc/os_os2.txt for additional info on running Vim.
 
 
-5. Atari MiNT
+4. Atari MiNT
 =============
 
 [NOTE: this is quite old, it might not work anymore]

diff --git a/src/Make_ro.mak b/src/Make_ro.mak
deleted file mode 100644 (file)
index 203a18a..0000000
--- a/src/Make_ro.mak
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# Makefile for Vim on RISC OS - Andy Wingate
-#
-
-GCC         = gcc -mthrowback
-CFLAGS     = -DRISCOS -DFEAT_GUI
-CC         = $(GCC) $(CFLAGS) -O2
-# -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c
-
-TERMFLAG   = -DUP_BC_PC_EXTERN
-
-ASMFLAGS   = -throwback -objasm -gcc
-
-OBJS =  o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2  \
-       o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \
-       o.hardcopy o.hashtab o.main o.mark o.mbyte  \
-       o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move     \
-       o.normal o.ops o.option o.popupmnu o.quickfix o.regexp o.screen \
-       o.search   \
-       o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version   \
-       o.window o.os_riscos o.swis o.gui o.gui_riscos
-
-Vim: $(OBJS)
-       $(GCC) -o Vim $(OBJS)
-
-install: Vim
-       squeeze -v Vim @.!Vim.Vim
-
-clean: 
-       create o.!fake! 0
-       wipe o.* ~cf
-       remove Vim
-
-o.swis: s.swis
-       as $(ASMFLAGS) -o o.swis s.swis
-
-# Rules for object files
-
-o.%:   c.%
-       $(CC) -c $< -o $@
-
-o.buffer:      c.buffer
-
-o.charset:     c.charset
-
-o.digraph:     c.digraph
-
-o.diff:                c.diff
-
-o.edit:                c.edit
-
-o.eval:                c.eval
-
-o.ex_cmds:     c.ex_cmds
-
-o.ex_cmds2:    c.ex_cmds2
-
-o.ex_docmd:    c.ex_docmd
-
-o.ex_eval:     c.ex_eval
-
-o.ex_getln:    c.ex_getln
-
-o.fileio:      c.fileio
-
-o.fold:                c.fold
-
-o.getchar:     c.getchar
-
-o.hardcopy:    c.hardcopy
-
-o.hashtab:     c.hashtab
-
-o.gui:         c.gui
-
-o.gui_riscos:  c.gui_riscos
-
-o.main:                c.main
-
-o.mark:                c.mark
-
-o.mbyte:       c.mbyte
-
-o.memfile:     c.memfile
-
-o.memline:     c.memline
-
-o.menu:                c.menu
-
-o.message:     c.message
-
-o.misc1:       c.misc1
-
-o.misc2:       c.misc2
-
-o.move:                c.move
-
-o.normal:      c.normal
-
-o.ops:         c.ops
-
-o.option:      c.option
-
-o.os_riscos:   c.os_riscos
-
-o.pty:         c.pty
-
-o.popupmnu:    c.popupmnu
-
-o.quickfix:    c.quickfix
-
-o.regexp:      c.regexp
-
-o.screen:      c.screen
-
-o.search:      c.search
-
-o.spell:       c.spell
-
-o.syntax:      c.syntax
-
-o.tag:         c.tag
-
-o.term:                c.term
-       $(CC) $(TERMFLAG) -c c.term -o o.term
-
-o.termlib:     c.termlib
-
-o.ui:          c.ui
-
-o.undo:                c.undo
-
-o.version:     c.version
-
-o.window:      c.window

diff --git a/src/Makefile b/src/Makefile
index 539c69f9b3c90d8b206e402ca9e6cb723c2157b5..5d5b6005a7f709a05f25b26bf836375c35c98746 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@
 #      - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but
 #        want to disable using X11 libraries.  This speeds up starting Vim,
 #        but the window title will not be set and the X11 selection can not
-#        used.
+#        be used.
 #      - Uncomment the line "CONF_OPT_XSMP = --disable-xsmp" if you have the
 #        X11 Session Management Protocol (XSMP) library (libSM) but do not
 #        want to use it.
@@ -730,12 +730,6 @@ LINT_OPTIONS = -beprxzF
 ### USL for Unix Systems Laboratories (SYSV 4.2)
 #EXTRA_DEFS = -DUSL
 
-### RISCos on MIPS without X11
-#EXTRA_DEFS = -DMIPS
-
-### RISCos on MIPS with X11
-#EXTRA_LIBS = -lsun
-
 ### (6)  A/UX 3.1.1 with gcc (Jim Jagielski)
 #CC= gcc -D_POSIX_SOURCE
 #CFLAGS= -O2
@@ -1633,7 +1627,7 @@ PRO_AUTO = \
 RSRC_DIR = os_mac_rsrc
 
 PRO_MANUAL = os_amiga.pro os_msdos.pro os_win16.pro os_win32.pro \
-       os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO)
+       os_mswin.pro os_beos.pro os_vms.pro $(PERL_PRO)
 
 # Default target is making the executable and tools
 all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)

diff --git a/src/buffer.c b/src/buffer.c
index 254331ef2b8d0c0817d73cd2e6bc1fb61f7636cc..24cbc06eb48b6c0c9f82702a5775ab85d6886a1f 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1808,9 +1808,6 @@ free_buf_options(buf, free_p_ff)
 #ifdef FEAT_AUTOCMD
     clear_string_option(&buf->b_p_ft);
 #endif
-#ifdef FEAT_OSFILETYPE
-    clear_string_option(&buf->b_p_oft);
-#endif
 #ifdef FEAT_CINDENT
     clear_string_option(&buf->b_p_cink);
     clear_string_option(&buf->b_p_cino);

diff --git a/src/eval.c b/src/eval.c
index ee2af100db9b836dc6517556cd53eec782635106..db7b1063802f10775d25fa76ca87d35559a07c27 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -12076,9 +12076,6 @@ f_has(argvars, rettv)
 #ifdef FEAT_OLE
        "ole",
 #endif
-#ifdef FEAT_OSFILETYPE
-       "osfiletype",
-#endif
 #ifdef FEAT_PATH_EXTRA
        "path_extra",
 #endif

diff --git a/src/feature.h b/src/feature.h
index ea79758af8e92b4c883c5bd4007bc3df3672f764..2fdd901b32db64b0c2ca0e4538a2b859e05b0179 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -505,15 +505,6 @@
 # define FEAT_WILDMENU
 #endif
 
-/*
- * +osfiletype         filetype checking in autocommand patterns.
- *                     Only on systems that support filetypes (RISC OS).
- */
-#if 0
-# define FEAT_OSFILETYPE
-# define DFLT_OFT "Text"
-#endif
-
 /*
  * +viminfo            reading/writing the viminfo file. Takes about 8Kbyte
  *                     of code.

diff --git a/src/option.c b/src/option.c
index a545588f41938f564807bf5833f48b850ec9b12b..718464951c79f3807383780df009644ce215c903 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -140,9 +140,6 @@
 #define PV_MOD         OPT_BUF(BV_MOD)
 #define PV_MPS         OPT_BUF(BV_MPS)
 #define PV_NF          OPT_BUF(BV_NF)
-#ifdef FEAT_OSFILETYPE
-# define PV_OFT                OPT_BUF(BV_OFT)
-#endif
 #ifdef FEAT_COMPL_FUNC
 # define PV_OFU                OPT_BUF(BV_OFU)
 #endif
@@ -337,9 +334,6 @@ static int  p_ma;
 static int     p_mod;
 static char_u  *p_mps;
 static char_u  *p_nf;
-#ifdef FEAT_OSFILETYPE
-static char_u  *p_oft;
-#endif
 static int     p_pi;
 #ifdef FEAT_TEXTOBJ
 static char_u  *p_qe;
@@ -1901,14 +1895,8 @@ static struct vimoption
                            (char_u *)NULL, PV_NONE,
                            {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
     {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
-#ifdef FEAT_OSFILETYPE
-                           (char_u *)&p_oft, PV_OFT,
-                           {(char_u *)DFLT_OFT, (char_u *)0L}
-#else
                            (char_u *)NULL, PV_NONE,
-                           {(char_u *)0L, (char_u *)0L}
-#endif
-                           SCRIPTID_INIT},
+                           {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
     {"paragraphs",  "para", P_STRING|P_VI_DEF,
                            (char_u *)&p_para, PV_NONE,
                            {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
@@ -5282,9 +5270,6 @@ check_buf_options(buf)
 #ifdef FEAT_AUTOCMD
     check_string_option(&buf->b_p_ft);
 #endif
-#ifdef FEAT_OSFILETYPE
-    check_string_option(&buf->b_p_oft);
-#endif
 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
     check_string_option(&buf->b_p_cinw);
 #endif
@@ -9665,9 +9650,6 @@ get_varp(p)
        case PV_MA:     return (char_u *)&(curbuf->b_p_ma);
        case PV_MOD:    return (char_u *)&(curbuf->b_changed);
        case PV_NF:     return (char_u *)&(curbuf->b_p_nf);
-#ifdef FEAT_OSFILETYPE
-       case PV_OFT:    return (char_u *)&(curbuf->b_p_oft);
-#endif
        case PV_PI:     return (char_u *)&(curbuf->b_p_pi);
 #ifdef FEAT_TEXTOBJ
        case PV_QE:     return (char_u *)&(curbuf->b_p_qe);
@@ -10017,9 +9999,6 @@ buf_copy_options(buf, flags)
 #ifdef FEAT_AUTOCMD
            /* Don't copy 'filetype', it must be detected */
            buf->b_p_ft = empty_option;
-#endif
-#ifdef FEAT_OSFILETYPE
-           buf->b_p_oft = vim_strsave(p_oft);
 #endif
            buf->b_p_pi = p_pi;
 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)

diff --git a/src/option.h b/src/option.h
index e2e65a0cd80e5f63dd66312486e093af073fba26..b5f7d47ef38d1ad1e3f0cb68719559711fce2dea 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -984,9 +984,6 @@ enum
     , BV_MOD
     , BV_MPS
     , BV_NF
-#ifdef FEAT_OSFILETYPE
-    , BV_OFT
-#endif
 #ifdef FEAT_COMPL_FUNC
     , BV_OFU
 #endif

diff --git a/src/pty.c b/src/pty.c
index bc28c0d9abbbb64978f7f3ce20c563dd6a0865f5..59e0069cc00da244dc1fb9470aff8a45a53a4fc7 100644 (file)
--- a/src/pty.c
+++ b/src/pty.c
@@ -123,8 +123,7 @@
 static void initmaster __ARGS((int));
 
 /*
- *  Open all ptys with O_NOCTTY, just to be on the safe side
- *  (RISCos mips breaks otherwise)
+ *  Open all ptys with O_NOCTTY, just to be on the safe side.
  */
 #ifndef O_NOCTTY
 # define O_NOCTTY 0

diff --git a/src/structs.h b/src/structs.h
index 2954035e3053a58d881d882d989eed175a8c1090..7b71a5f86fa1be3f44ef0fbea8fbb3b50c69a743 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1530,9 +1530,6 @@ struct file_buffer
     int                b_p_ml_nobin;   /* b_p_ml saved for binary mode */
     int                b_p_ma;         /* 'modifiable' */
     char_u     *b_p_nf;        /* 'nrformats' */
-#ifdef FEAT_OSFILETYPE
-    char_u     *b_p_oft;       /* 'osfiletype' */
-#endif
     int                b_p_pi;         /* 'preserveindent' */
 #ifdef FEAT_TEXTOBJ
     char_u     *b_p_qe;        /* 'quoteescape' */

diff --git a/src/version.c b/src/version.c
index c83ba0e2f2e65c93ff779e7cb2d8a2eaf4ecd34c..a14c43de6ac55794a16a38becf2920e429179761 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -426,11 +426,6 @@ static char *(features[]) =
        "-ole",
 # endif
 #endif
-#ifdef FEAT_OSFILETYPE
-       "+osfiletype",
-#else
-       "-osfiletype",
-#endif
 #ifdef FEAT_PATH_EXTRA
        "+path_extra",
 #else
@@ -714,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    191,
 /**/
     190,
 /**/