2 Subject: Patch 6.3.035 (extra)
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: RISC OS: Compile errors.
12 Solution: Change e_screnmode to e_screenmode. Change the way
13 __riscosify_control is set. Improve the makefile. (Andy Wingate)
14 Files: src/os_riscos.c, src/search.c, src/Make_ro.mak
17 *** ../vim-6.3.034/src/os_riscos.c Wed Jun 9 14:56:26 2004
18 --- src/os_riscos.c Mon Nov 22 10:37:11 2004
23 /* Turn off all the horrible filename munging in UnixLib. */
24 ! __riscosify_control = __RISCOSIFY_NO_PROCESS;
31 /* Turn off all the horrible filename munging in UnixLib. */
32 ! int __riscosify_control = __RISCOSIFY_NO_PROCESS;
41 ! EMSG(_(e_screnmode));
49 ! EMSG(_(e_screenmode));
53 *** ../vim-6.3.034/src/search.c Wed Jun 16 10:56:31 2004
54 --- src/search.c Mon Nov 22 10:39:04 2004
59 /* UnixLib knows best how to munge c file names - turn munging back on. */
60 ! __riscosify_control = __RISCOSIFY_LONG_TRUNCATE;
63 if (type != CHECK_PATH && type != FIND_DEFINE
67 /* UnixLib knows best how to munge c file names - turn munging back on. */
68 ! int __riscosify_control = 0;
71 if (type != CHECK_PATH && type != FIND_DEFINE
72 *** ../vim-6.3.034/src/Make_ro.mak Wed Jun 9 14:56:26 2004
73 --- src/Make_ro.mak Mon Nov 22 10:43:27 2004
76 # Makefile for Vim on RISC OS - Andy Wingate
79 ! GCC = gcc -mthrowback
80 ! CFLAGS = -DRISCOS -DFEAT_GUI
81 ! # Optimising on ex_docmd.c seems to cause segfaults on compilation. Needs investigation.
82 ! CCEX_DOCMD = $(GCC) $(CFLAGS)
83 ! CC = $(GCC) $(CFLAGS) -O2
84 # -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c
86 TERMFLAG = -DUP_BC_PC_EXTERN
88 ASMFLAGS = -throwback -objasm -gcc
90 ! OBJS = o.buffer o.charset o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 o.diff \
91 o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar o.main o.mark o.mbyte \
92 o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \
93 o.normal o.ops o.option o.quickfix o.regexp o.screen o.search \
95 # Makefile for Vim on RISC OS - Andy Wingate
98 ! GCC = gcc -mthrowback
99 ! CFLAGS = -DRISCOS -DFEAT_GUI
100 ! CC = $(GCC) $(CFLAGS) -O2
101 # -DUP_BC_PC_EXTERN for term.c needed as BC defined in termlib.c and term.c
103 TERMFLAG = -DUP_BC_PC_EXTERN
105 ASMFLAGS = -throwback -objasm -gcc
107 ! OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \
108 o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar o.main o.mark o.mbyte \
109 o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \
110 o.normal o.ops o.option o.quickfix o.regexp o.screen o.search \
113 as $(ASMFLAGS) -o o.swis s.swis
115 # Rules for object files
116 ! # You shouldn't need to put all this information in as all but term.c have the same
117 ! # rule (and only then to save extra defines) but some versions of make are awkward.
120 - $(CC) -c c.buffer -o o.buffer
123 - $(CC) -c c.charset -o o.charset
126 - $(CC) -c c.digraph -o o.digraph
129 - $(CC) -c c.diff -o o.diff
132 - $(CC) -c c.edit -o o.edit
135 - $(CC) -c c.eval -o o.eval
138 - $(CC) -c c.ex_cmds -o o.ex_cmds
140 o.ex_cmds2: c.ex_cmds2
141 - $(CC) -c c.ex_cmds2 -o o.ex_cmds2
143 o.ex_docmd: c.ex_docmd
144 - $(CCEX_DOCMD) -c c.ex_docmd -o o.ex_docmd
147 - $(CCEX_DOCMD) -c c.ex_eval -o o.ex_eval
149 o.ex_getln: c.ex_getln
150 - $(CC) -c c.ex_getln -o o.ex_getln
153 - $(CC) -c c.fileio -o o.fileio
156 - $(CC) -c c.fold -o o.fold
159 - $(CC) -c c.getchar -o o.getchar
162 - $(CC) -c c.gui -o o.gui
164 o.gui_riscos: c.gui_riscos
165 - $(CC) -c c.gui_riscos -o o.gui_riscos
168 - $(CC) -c c.main -o o.main
171 - $(CC) -c c.mark -o o.mark
174 - $(CC) -c c.mbyte -o o.mbyte
177 - $(CC) -c c.memfile -o o.memfile
180 - $(CC) -c c.memline -o o.memline
183 - $(CC) -c c.menu -o o.menu
186 - $(CC) -c c.message -o o.message
189 - $(CC) -c c.misc1 -o o.misc1
192 - $(CC) -c c.misc2 -o o.misc2
195 - $(CC) -c c.move -o o.move
198 - $(CC) -c c.normal -o o.normal
201 - $(CC) -c c.ops -o o.ops
204 - $(CC) -c c.option -o o.option
206 o.os_riscos: c.os_riscos
207 - $(CC) -c c.os_riscos -o o.os_riscos
210 - $(CC) -c c.pty -o p.pty
212 o.quickfix: c.quickfix
213 - $(CC) -c c.quickfix -o o.quickfix
216 - $(CC) -c c.regexp -o o.regexp
219 - $(CC) -c c.screen -o o.screen
222 - $(CC) -c c.search -o o.search
225 - $(CC) -c c.syntax -o o.syntax
228 - $(CC) -c c.tag -o o.tag
231 $(CC) $(TERMFLAG) -c c.term -o o.term
234 - $(CC) -c c.termlib -o o.termlib
237 - $(CC) -c c.ui -o o.ui
240 - $(CC) -c c.undo -o o.undo
243 - $(CC) -c c.version -o o.version
246 - $(CC) -c c.window -o o.window
248 as $(ASMFLAGS) -o o.swis s.swis
250 # Rules for object files
269 o.ex_cmds2: c.ex_cmds2
271 o.ex_docmd: c.ex_docmd
275 o.ex_getln: c.ex_getln
285 o.gui_riscos: c.gui_riscos
313 o.os_riscos: c.os_riscos
317 o.quickfix: c.quickfix
330 $(CC) $(TERMFLAG) -c c.term -o o.term
341 *** ../vim-6.3.034/src/version.c Mon Nov 22 10:04:21 2004
342 --- src/version.c Mon Nov 22 10:41:25 2004
346 { /* Add new patch number below this line */
352 Q: What do you call a fish without an eye?
354 Q: What do you call a deer with no eyes?
356 Q: What do you call a deer with no eyes and no legs?
357 A: still no eye deer.
359 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
360 /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
361 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
362 \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///