[packages/vim.git] / 6.3.035

To: vim-dev@vim.org
Subject: Patch 6.3.035 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.3.035 (extra)
Problem:    RISC OS: Compile errors.
Solution:   Change e_screnmode to e_screenmode.  Change the way
	    __riscosify_control is set.  Improve the makefile.  (Andy Wingate)
Files:	    src/os_riscos.c, src/search.c, src/Make_ro.mak


*** ../vim-6.3.034/src/os_riscos.c	Wed Jun  9 14:56:26 2004
--- src/os_riscos.c	Mon Nov 22 10:37:11 2004
***************
*** 683,689 ****
  mch_early_init()
  {
      /* Turn off all the horrible filename munging in UnixLib. */
!     __riscosify_control = __RISCOSIFY_NO_PROCESS;
  }
  
      void
--- 683,689 ----
  mch_early_init()
  {
      /* Turn off all the horrible filename munging in UnixLib. */
!     int __riscosify_control = __RISCOSIFY_NO_PROCESS;
  }
  
      void
***************
*** 755,761 ****
  mch_screenmode(arg)
      char_u   *arg;
  {
!     EMSG(_(e_screnmode));
      return FAIL;
  }
  
--- 755,761 ----
  mch_screenmode(arg)
      char_u   *arg;
  {
!     EMSG(_(e_screenmode));
      return FAIL;
  }
  
*** ../vim-6.3.034/src/search.c	Wed Jun 16 10:56:31 2004
--- src/search.c	Mon Nov 22 10:39:04 2004
***************
*** 3684,3690 ****
  
  #ifdef RISCOS
      /* UnixLib knows best how to munge c file names - turn munging back on. */
!     __riscosify_control = __RISCOSIFY_LONG_TRUNCATE;
  #endif
  
      if (type != CHECK_PATH && type != FIND_DEFINE
--- 3684,3690 ----
  
  #ifdef RISCOS
      /* UnixLib knows best how to munge c file names - turn munging back on. */
!     int __riscosify_control = 0;
  #endif
  
      if (type != CHECK_PATH && type != FIND_DEFINE
*** ../vim-6.3.034/src/Make_ro.mak	Wed Jun  9 14:56:26 2004
--- src/Make_ro.mak	Mon Nov 22 10:43:27 2004
***************
*** 2,19 ****
  # Makefile for Vim on RISC OS - Andy Wingate
  #
  
! GCC	    = gcc -mthrowback
! CFLAGS	   = -DRISCOS -DFEAT_GUI
! # Optimising on ex_docmd.c seems to cause segfaults on compilation. Needs investigation.
! CCEX_DOCMD = $(GCC) $(CFLAGS)
! 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.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 o.diff \
  	o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar 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.quickfix o.regexp o.screen o.search   \
--- 2,17 ----
  # 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.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.quickfix o.regexp o.screen o.search   \
***************
*** 35,168 ****
  	as $(ASMFLAGS) -o o.swis s.swis
  
  # Rules for object files
! # You shouldn't need to put all this information in as all but term.c have the same
! # rule (and only then to save extra defines) but some versions of make are awkward.
  
  o.buffer:	c.buffer
- 	$(CC) -c c.buffer -o o.buffer
  
  o.charset:	c.charset
- 	$(CC) -c c.charset -o o.charset
  
  o.digraph:	c.digraph
- 	$(CC) -c c.digraph -o o.digraph
  
  o.diff:		c.diff
- 	$(CC) -c c.diff -o o.diff
  
  o.edit:		c.edit
- 	$(CC) -c c.edit -o o.edit
  
  o.eval:		c.eval
- 	$(CC) -c c.eval -o o.eval
  
  o.ex_cmds:	c.ex_cmds
- 	$(CC) -c c.ex_cmds -o o.ex_cmds
  
  o.ex_cmds2:	c.ex_cmds2
- 	$(CC) -c c.ex_cmds2 -o o.ex_cmds2
  
  o.ex_docmd:	c.ex_docmd
- 	$(CCEX_DOCMD) -c c.ex_docmd -o o.ex_docmd
  
  o.ex_eval:	c.ex_eval
- 	$(CCEX_DOCMD) -c c.ex_eval -o o.ex_eval
  
  o.ex_getln:	c.ex_getln
- 	$(CC) -c c.ex_getln -o o.ex_getln
  
  o.fileio:	c.fileio
- 	$(CC) -c c.fileio -o o.fileio
  
  o.fold:		c.fold
- 	$(CC) -c c.fold -o o.fold
  
  o.getchar:	c.getchar
- 	$(CC) -c c.getchar -o o.getchar
  
  o.gui:		c.gui
- 	$(CC) -c c.gui -o o.gui
  
  o.gui_riscos:	c.gui_riscos
- 	$(CC) -c c.gui_riscos -o o.gui_riscos
  
  o.main:		c.main
- 	$(CC) -c c.main -o o.main
  
  o.mark:		c.mark
- 	$(CC) -c c.mark -o o.mark
  
  o.mbyte:	c.mbyte
- 	$(CC) -c c.mbyte -o o.mbyte
  
  o.memfile:	c.memfile
- 	$(CC) -c c.memfile -o o.memfile
  
  o.memline:	c.memline
- 	$(CC) -c c.memline -o o.memline
  
  o.menu:		c.menu
- 	$(CC) -c c.menu -o o.menu
  
  o.message:	c.message
- 	$(CC) -c c.message -o o.message
  
  o.misc1:	c.misc1
- 	$(CC) -c c.misc1 -o o.misc1
  
  o.misc2:	c.misc2
- 	$(CC) -c c.misc2 -o o.misc2
  
  o.move:		c.move
- 	$(CC) -c c.move -o o.move
  
  o.normal:	c.normal
- 	$(CC) -c c.normal -o o.normal
  
  o.ops:		c.ops
- 	$(CC) -c c.ops -o o.ops
  
  o.option:	c.option
- 	$(CC) -c c.option -o o.option
  
  o.os_riscos:	c.os_riscos
- 	$(CC) -c c.os_riscos -o o.os_riscos
  
  o.pty:		c.pty
- 	$(CC) -c c.pty -o p.pty
  
  o.quickfix:	c.quickfix
- 	$(CC) -c c.quickfix -o o.quickfix
  
  o.regexp:	c.regexp
- 	$(CC) -c c.regexp -o o.regexp
  
  o.screen:	c.screen
- 	$(CC) -c c.screen -o o.screen
  
  o.search:	c.search
- 	$(CC) -c c.search -o o.search
  
  o.syntax:	c.syntax
- 	$(CC) -c c.syntax -o o.syntax
  
  o.tag:		c.tag
- 	$(CC) -c c.tag -o o.tag
  
  o.term:		c.term
  	$(CC) $(TERMFLAG) -c c.term -o o.term
  
  o.termlib:	c.termlib
- 	$(CC) -c c.termlib -o o.termlib
  
  o.ui:		c.ui
- 	$(CC) -c c.ui -o o.ui
  
  o.undo:		c.undo
- 	$(CC) -c c.undo -o o.undo
  
  o.version:	c.version
- 	$(CC) -c c.version -o o.version
  
  o.window:	c.window
- 	$(CC) -c c.window -o o.window
--- 33,125 ----
  	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.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.quickfix:	c.quickfix
  
  o.regexp:	c.regexp
  
  o.screen:	c.screen
  
  o.search:	c.search
  
  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
*** ../vim-6.3.034/src/version.c	Mon Nov 22 10:04:21 2004
--- src/version.c	Mon Nov 22 10:41:25 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     35,
  /**/

-- 
Q: What do you call a fish without an eye?
A: fsh!
Q: What do you call a deer with no eyes?
A: no eye deer.
Q: What do you call a deer with no eyes and no legs?
A: still no eye deer.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///
Commit	Line	Data
c9e2e521 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 6.3.035 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.3.035 (extra)
	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
	15
	16
	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
	19	***************
	20	* 683,689 **
	21	mch_early_init()
	22	{
	23	/* Turn off all the horrible filename munging in UnixLib. */
	24	! __riscosify_control = __RISCOSIFY_NO_PROCESS;
	25	}
	26
	27	void
	28	--- 683,689 ----
	29	mch_early_init()
	30	{
	31	/* Turn off all the horrible filename munging in UnixLib. */
	32	! int __riscosify_control = __RISCOSIFY_NO_PROCESS;
	33	}
	34
	35	void
	36	***************
	37	* 755,761 **
	38	mch_screenmode(arg)
	39	char_u *arg;
	40	{
	41	! EMSG(_(e_screnmode));
	42	return FAIL;
	43	}
	44
	45	--- 755,761 ----
	46	mch_screenmode(arg)
	47	char_u *arg;
	48	{
	49	! EMSG(_(e_screenmode));
	50	return FAIL;
	51	}
	52
	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
	55	***************
	56	* 3684,3690 **
	57
	58	#ifdef RISCOS
	59	/* UnixLib knows best how to munge c file names - turn munging back on. */
	60	! __riscosify_control = __RISCOSIFY_LONG_TRUNCATE;
	61	#endif
	62
	63	if (type != CHECK_PATH && type != FIND_DEFINE
	64	--- 3684,3690 ----
65
66	#ifdef RISCOS
67	/* UnixLib knows best how to munge c file names - turn munging back on. */
68	! int __riscosify_control = 0;
69	#endif
70
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
74	***************
75	* 2,19 **
76	# Makefile for Vim on RISC OS - Andy Wingate
77	#
78
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
85
86	TERMFLAG = -DUP_BC_PC_EXTERN
87
88	ASMFLAGS = -throwback -objasm -gcc
89
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 \
94	--- 2,17 ----
95	# Makefile for Vim on RISC OS - Andy Wingate
96	#
97
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
102
103	TERMFLAG = -DUP_BC_PC_EXTERN
104
105	ASMFLAGS = -throwback -objasm -gcc
106
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 \
111	***************
112	* 35,168 **
113	as $(ASMFLAGS) -o o.swis s.swis
114
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.
118
119	o.buffer: c.buffer
120	- $(CC) -c c.buffer -o o.buffer
121
122	o.charset: c.charset
123	- $(CC) -c c.charset -o o.charset
124
125	o.digraph: c.digraph
126	- $(CC) -c c.digraph -o o.digraph
127
128	o.diff: c.diff
129	- $(CC) -c c.diff -o o.diff
130
131	o.edit: c.edit
132	- $(CC) -c c.edit -o o.edit
133
134	o.eval: c.eval
135	- $(CC) -c c.eval -o o.eval
136
137	o.ex_cmds: c.ex_cmds
138	- $(CC) -c c.ex_cmds -o o.ex_cmds
139
140	o.ex_cmds2: c.ex_cmds2
141	- $(CC) -c c.ex_cmds2 -o o.ex_cmds2
142
143	o.ex_docmd: c.ex_docmd
144	- $(CCEX_DOCMD) -c c.ex_docmd -o o.ex_docmd
145
146	o.ex_eval: c.ex_eval
147	- $(CCEX_DOCMD) -c c.ex_eval -o o.ex_eval
148
149	o.ex_getln: c.ex_getln
150	- $(CC) -c c.ex_getln -o o.ex_getln
151
152	o.fileio: c.fileio
153	- $(CC) -c c.fileio -o o.fileio
154
155	o.fold: c.fold
156	- $(CC) -c c.fold -o o.fold
157
158	o.getchar: c.getchar
159	- $(CC) -c c.getchar -o o.getchar
160
161	o.gui: c.gui
162	- $(CC) -c c.gui -o o.gui
163
164	o.gui_riscos: c.gui_riscos
165	- $(CC) -c c.gui_riscos -o o.gui_riscos
166
167	o.main: c.main
168	- $(CC) -c c.main -o o.main
169
170	o.mark: c.mark
171	- $(CC) -c c.mark -o o.mark
172
173	o.mbyte: c.mbyte
174	- $(CC) -c c.mbyte -o o.mbyte
175
176	o.memfile: c.memfile
177	- $(CC) -c c.memfile -o o.memfile
178
179	o.memline: c.memline
180	- $(CC) -c c.memline -o o.memline
181
182	o.menu: c.menu
183	- $(CC) -c c.menu -o o.menu
184
185	o.message: c.message
186	- $(CC) -c c.message -o o.message
187
188	o.misc1: c.misc1
189	- $(CC) -c c.misc1 -o o.misc1
190
191	o.misc2: c.misc2
192	- $(CC) -c c.misc2 -o o.misc2
193
194	o.move: c.move
195	- $(CC) -c c.move -o o.move
196
197	o.normal: c.normal
198	- $(CC) -c c.normal -o o.normal
199
200	o.ops: c.ops
201	- $(CC) -c c.ops -o o.ops
202
203	o.option: c.option
204	- $(CC) -c c.option -o o.option
205
206	o.os_riscos: c.os_riscos
207	- $(CC) -c c.os_riscos -o o.os_riscos
208
209	o.pty: c.pty
210	- $(CC) -c c.pty -o p.pty
211
212	o.quickfix: c.quickfix
213	- $(CC) -c c.quickfix -o o.quickfix
214
215	o.regexp: c.regexp
216	- $(CC) -c c.regexp -o o.regexp
217
218	o.screen: c.screen
219	- $(CC) -c c.screen -o o.screen
220
221	o.search: c.search
222	- $(CC) -c c.search -o o.search
223
224	o.syntax: c.syntax
225	- $(CC) -c c.syntax -o o.syntax
226
227	o.tag: c.tag
228	- $(CC) -c c.tag -o o.tag
229
230	o.term: c.term
231	$(CC) $(TERMFLAG) -c c.term -o o.term
232
233	o.termlib: c.termlib
234	- $(CC) -c c.termlib -o o.termlib
235
236	o.ui: c.ui
237	- $(CC) -c c.ui -o o.ui
238
239	o.undo: c.undo
240	- $(CC) -c c.undo -o o.undo
241
242	o.version: c.version
243	- $(CC) -c c.version -o o.version
244
245	o.window: c.window
246	- $(CC) -c c.window -o o.window
247	--- 33,125 ----
248	as $(ASMFLAGS) -o o.swis s.swis
249
250	# Rules for object files
251	!
252	! o.%: c.%
253	! $(CC) -c $< -o $@
254
255	o.buffer: c.buffer
256
257	o.charset: c.charset
258
259	o.digraph: c.digraph
260
261	o.diff: c.diff
262
263	o.edit: c.edit
264
265	o.eval: c.eval
266
267	o.ex_cmds: c.ex_cmds
268
269	o.ex_cmds2: c.ex_cmds2
270
271	o.ex_docmd: c.ex_docmd
272
273	o.ex_eval: c.ex_eval
274
275	o.ex_getln: c.ex_getln
276
277	o.fileio: c.fileio
278
279	o.fold: c.fold
280
281	o.getchar: c.getchar
282
283	o.gui: c.gui
284
285	o.gui_riscos: c.gui_riscos
286
287	o.main: c.main
288
289	o.mark: c.mark
290
291	o.mbyte: c.mbyte
292
293	o.memfile: c.memfile
294
295	o.memline: c.memline
296
297	o.menu: c.menu
298
299	o.message: c.message
300
301	o.misc1: c.misc1
302
303	o.misc2: c.misc2
304
305	o.move: c.move
306
307	o.normal: c.normal
308
309	o.ops: c.ops
310
311	o.option: c.option
312
313	o.os_riscos: c.os_riscos
314
315	o.pty: c.pty
316
317	o.quickfix: c.quickfix
318
319	o.regexp: c.regexp
320
321	o.screen: c.screen
322
323	o.search: c.search
324
325	o.syntax: c.syntax
326
327	o.tag: c.tag
328
329	o.term: c.term
330	$(CC) $(TERMFLAG) -c c.term -o o.term
331
332	o.termlib: c.termlib
333
334	o.ui: c.ui
335
336	o.undo: c.undo
337
338	o.version: c.version
339
340	o.window: c.window
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
343	***************
344	* 643,644 **
345	--- 643,646 ----
346	{ /* Add new patch number below this line */
347	+ /**/
348	+ 35,
349	/**/
350
351	--
352	Q: What do you call a fish without an eye?
353	A: fsh!
354	Q: What do you call a deer with no eyes?
355	A: no eye deer.
356	Q: What do you call a deer with no eyes and no legs?
357	A: still no eye deer.
358
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 ///