On 05/10/2011 11:22 PM, Bram Moolenaar wrote:
Patch 7.3.188
Problem: More RISC OS files to remove.
Solution: Remove them. Update the file list.
Files: src/proto/gui_riscos.pro, src/proto/os_riscos.pro, Filelist
*** ../vim-7.3.187/src/proto/gui_riscos.pro 2010-08-15 21:57:28.000000000
+0200
--- src/proto/gui_riscos.pro 1970-01-01 01:00:00.000000000 +0100
***************
*** 1,66 ****
- /* Prototypes for gui_riscos.c
- * Based on gui_x11_pro.h (10 March 2002 version)
- */
- void gui_mch_prepare __ARGS((int *argc, char **argv));
- int gui_mch_init_check __ARGS((void));
- int gui_mch_init __ARGS((void));
- void gui_mch_uninit __ARGS((void));
- void gui_mch_new_colors __ARGS((void));
- int gui_mch_open __ARGS((void));
- void gui_init_tooltip_font __ARGS((void));
- void gui_init_menu_font __ARGS((void));void gui_mch_exit __ARGS((int rc));
- int gui_mch_get_winpos __ARGS((int *x, int *y));
- void gui_mch_set_winpos __ARGS((int x, int y));
- void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int
min_height, int base_width, int base_height));
- void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
- int gui_mch_init_font __ARGS((char_u *font_name, int do_fontset));
- GuiFont gui_mch_get_font __ARGS((char_u *name, int giveErrorIfMissing));
- int gui_mch_adjust_charheight __ARGS((void));
- void gui_mch_set_font __ARGS((GuiFont font));
- void gui_mch_set_fontset __ARGS((GuiFontset fontset));
- void gui_mch_free_font __ARGS((GuiFont font));
- void gui_mch_free_fontset __ARGS((GuiFontset fontset));
- GuiFontset gui_mch_get_fontset __ARGS((char_u *name, int giveErrorIfMissing,
int fixed_width));
- guicolor_T gui_mch_get_color __ARGS((char_u *reqname));
- void gui_mch_set_fg_color __ARGS((guicolor_T color));
- void gui_mch_set_bg_color __ARGS((guicolor_T color));
- void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int
flags));
- int gui_mch_haskey __ARGS((char_u *name));
- void gui_mch_beep __ARGS((void));
- void gui_mch_flash __ARGS((int msec));
- void gui_mch_invert_rectangle __ARGS((int r, int c, int nr, int nc));
- void gui_mch_iconify __ARGS((void));
- void gui_mch_set_foreground __ARGS((void));
- void gui_mch_draw_hollow_cursor __ARGS((guicolor_T color));
- void gui_mch_draw_part_cursor __ARGS((int w, int h, guicolor_T color));
- void gui_mch_update __ARGS((void));
- int gui_mch_wait_for_chars __ARGS((long wtime));
- void gui_mch_flush __ARGS((void));
- void gui_mch_clear_block __ARGS((int row1, int col1, int row2, int col2));
- void gui_mch_clear_all __ARGS((void));
- void gui_mch_delete_lines __ARGS((int row, int num_lines));
- void gui_mch_insert_lines __ARGS((int row, int num_lines));
- void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
- int clip_mch_own_selection __ARGS((VimClipboard *cbd));
- void clip_mch_request_selection __ARGS((VimClipboard *cbd));
- void clip_mch_set_selection __ARGS((VimClipboard *cbd));
- void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
- void gui_mch_menu_hidden __ARGS((vimmenu_T *menu, int hidden));
- void gui_mch_draw_menubar __ARGS((void));
- void gui_mch_set_blinking __ARGS((long waittime, long on, long off));
- void gui_mch_stop_blink __ARGS((void));
- void gui_mch_start_blink __ARGS((void));
- void process_event __ARGS((int event, int *block));
- void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
- long_u gui_mch_get_rgb __ARGS((guicolor_T pixel));
- void gui_mch_getmouse __ARGS((int *x, int *y));
- void gui_mch_setmouse __ARGS((int x, int y));
- void gui_mch_drawsign __ARGS((int row, int col, int typenr));
- void gui_mch_destroy_sign __ARGS((XImage *sign));
- void gui_mch_mousehide __ARGS((int hide));
- void mch_set_mouse_shape __ARGS((int shape));
- void gui_mch_menu_set_tip __ARGS((vimmenu_T *menu));
-
- void ro_redraw_title __ARGS((int window));
- int ro_ok_to_quit __ARGS((void));
- /* vim: set ft=c : */
--- 0 ----
*** ../vim-7.3.187/src/proto/os_riscos.pro 2010-08-15 21:57:28.000000000
+0200
--- src/proto/os_riscos.pro 1970-01-01 01:00:00.000000000 +0100
***************
*** 1,49 ****
- /* os_riscos.c */
- void mch_write __ARGS((char_u *s, int len));
- int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int
tb_change_cnt));
- int mch_char_avail __ARGS((void));
- long_u mch_avail_mem __ARGS((int special));
- void mch_delay __ARGS((long msec, int ignoreinput));
- void mch_suspend __ARGS((void));
- void mch_init __ARGS((void));
- int mch_check_win __ARGS((int argc, char **argv));
- int mch_input_isatty __ARGS((void));
- int mch_can_restore_title __ARGS((void));
- int mch_can_restore_icon __ARGS((void));
- void mch_settitle __ARGS((char_u *title, char_u *icon));
- void mch_restore_title __ARGS((int which));
- int mch_get_user_name __ARGS((char_u *s, int len));
- void mch_get_host_name __ARGS((char_u *s, int len));
- long mch_get_pid __ARGS((void));
- int mch_dirname __ARGS((char_u *buf, int len));
- int mch_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
- int mch_isFullName __ARGS((char_u *fname));
- long mch_getperm __ARGS((char_u *name));
- int mch_setperm __ARGS((char_u *name, long perm));
- void mch_hide __ARGS((char_u *name));
- int mch_isdir __ARGS((char_u *name));
- int mch_can_exe __ARGS((char_u *name));
- int mch_nodetype __ARGS((char_u *name));
- void mch_early_init __ARGS((void));
- void mch_exit __ARGS((int r));
- void mch_settmode __ARGS((int tmode));
- void mch_setmouse __ARGS((int on));
- int mch_screenmode __ARGS((char_u *arg));
- int mch_get_shellsize __ARGS((void));
- void mch_set_shellsize __ARGS((void));
- void mch_new_shellsize __ARGS((void));
- int mch_call_shell __ARGS((char_u *cmd, int options));
- void mch_breakcheck __ARGS((void));
- int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
- int expand_section __ARGS((garray_T *gap, char_u *root, char_u *rest, int
flags));
- int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file,
char_u ***file, int flags));
- int mch_has_exp_wildcard __ARGS((char_u *p));
- int mch_has_wildcard __ARGS((char_u *p));
- int mch_remove __ARGS((char_u *file));
- char_u *mch_munge_fname __ARGS((char_u *fname));
- int ro_buflist_add __ARGS((char_u *old_name));
- int mch_chdir __ARGS((char_u *dir));
- void mch_read_filetype __ARGS((char_u *file));
- void mch_set_filetype __ARGS((char_u *file, char_u *type));
- int mch_check_filetype __ARGS((char_u *fname, char_u *type));
- /* vim: set ft=c : */
--- 0 ----
*** ../vim-7.3.187/Filelist 2011-03-22 18:10:34.000000000 +0100
--- Filelist 2011-05-10 17:19:21.000000000 +0200
***************
*** 428,435 ****
README_os390.txt \
src/Make_mint.mak \
src/Make_ro.mak \
- src/gui_riscos.c \
- src/gui_riscos.h \
src/if_sniff.c \
src/infplist.xml \
src/link.390 \
--- 428,433 ----
***************
*** 437,446 ****
src/os_beos.h \
src/os_beos.rsrc \
src/os_mint.h \
- src/os_riscos.c \
- src/os_riscos.h \
- src/proto/gui_riscos.pro \
- src/proto/os_riscos.pro \
src/os_vms_fix.com \
src/toolbar.phi \
--- 435,440 ----
*** ../vim-7.3.187/src/version.c 2011-05-10 16:41:13.000000000 +0200
--- src/version.c 2011-05-10 17:20:50.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 188,
/**/
Hello,
Here is a patch to remove more riscos related content.
Regards,
Hong Xu
05/15/2011
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
diff -r d161a7f704f6 README_extra.txt
--- a/README_extra.txt Tue May 10 17:29:34 2011 +0200
+++ b/README_extra.txt Sun May 15 19:14:35 2011 +0800
@@ -13,9 +13,6 @@
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 -r d161a7f704f6 src/INSTALL
--- a/src/INSTALL Tue May 10 17:29:34 2011 +0200
+++ b/src/INSTALL Sun May 15 19:14:35 2011 +0800
@@ -6,9 +6,8 @@
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 @@
./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 @@
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 -r d161a7f704f6 src/Make_ro.mak
--- a/src/Make_ro.mak Tue May 10 17:29:34 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d161a7f704f6 src/Makefile
--- a/src/Makefile Tue May 10 17:29:34 2011 +0200
+++ b/src/Makefile Sun May 15 19:14:35 2011 +0800
@@ -730,12 +730,6 @@
### 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 @@
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 -r d161a7f704f6 src/po/es.po
--- a/src/po/es.po Tue May 10 17:29:34 2011 +0200
+++ b/src/po/es.po Sun May 15 19:14:35 2011 +0800
@@ -2806,24 +2806,6 @@
msgid "&Undo"
msgstr "&Deshacer"
-#: gui_riscos.c:953
-#, c-format
-msgid "E610: Can't load Zap font '%s'"
-msgstr "E610: No se pudo cargar el tipo de letra de impresión Zap '%s'"
-
-#: gui_riscos.c:1052
-#, c-format
-msgid "E611: Can't use font %s"
-msgstr "E611: No se puede usar el tipo de letra de impresión %s"
-
-#: gui_riscos.c:3282
-msgid ""
-"\n"
-"Sending message to terminate child process.\n"
-msgstr ""
-"\n"
-"Enviando mensaje para terminar los procesos dependientes (\"child\").\n"
-
#: gui_w32.c:1177
#, c-format
msgid "E671: Cannot find window title \"%s\""
@@ -5814,10 +5796,6 @@
"E245: Carácter '%c' ilegal en el nombre del tipo de letra de\n"
"impresión %s"
-#: os_riscos.c:1263
-msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: La opción \"osfiletype\" no es válida - usando Texto"
-
#: os_unix.c:1065
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: Señal doble, saliendo\n"
diff -r d161a7f704f6 src/pty.c
--- a/src/pty.c Tue May 10 17:29:34 2011 +0200
+++ b/src/pty.c Sun May 15 19:14:35 2011 +0800
@@ -124,7 +124,6 @@
/*
* Open all ptys with O_NOCTTY, just to be on the safe side
- * (RISCos mips breaks otherwise)
*/
#ifndef O_NOCTTY
# define O_NOCTTY 0
