[packages/vim.git] / 7.3.085

To: vim_dev@googlegroups.com
Subject: Patch 7.3.085
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.085 (after 7.3.083)
Problem:    Inconsistency with preproc symbols.  void * computation.
Solution:   Include vimio.h from vim.h.  Add type cast.
Files:      src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/fileio.c,
            src/if_cscope.c, src/if_sniff.c, src/main.c, src/memfile.c,
            src/memline.c, src/netbeans.c, src/os_msdos.c, src/os_mswin.c,
            src/os_win16.c, src/os_win32.c, src/spell.c, src/tag.c,
            src/undo.c, src/vim.h


*** ../vim-7.3.084/src/eval.c	2010-12-02 21:44:35.000000000 +0100
--- src/eval.c	2010-12-17 17:45:37.000000000 +0100
***************
*** 10,18 ****
  /*
   * eval.c: Expression evaluation.
   */
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for mch_open(), must be before vim.h */
- #endif
  
  #include "vim.h"
  
--- 10,15 ----
*** ../vim-7.3.084/src/ex_cmds.c	2010-11-24 17:59:27.000000000 +0100
--- src/ex_cmds.c	2010-12-17 17:46:09.000000000 +0100
***************
*** 11,20 ****
   * ex_cmds.c: some functions for command line commands
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for mch_open(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  #include "version.h"
  
--- 11,16 ----
*** ../vim-7.3.084/src/ex_cmds2.c	2010-09-21 16:56:29.000000000 +0200
--- src/ex_cmds2.c	2010-12-17 17:46:26.000000000 +0100
***************
*** 11,20 ****
   * ex_cmds2.c: some more functions for command line commands
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for mch_open(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  #include "version.h"
  
--- 11,16 ----
*** ../vim-7.3.084/src/fileio.c	2010-12-17 16:27:09.000000000 +0100
--- src/fileio.c	2010-12-17 17:52:42.000000000 +0100
***************
*** 11,24 ****
   * fileio.c: read from and write to a file
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for lseek(), must be before vim.h */
- #endif
- 
- #if defined __EMX__
- # include "vimio.h"	/* for mktemp(), CJW 1997-12-03 */
- #endif
- 
  #include "vim.h"
  
  #if defined(__TANDEM) || defined(__MINT__)
--- 11,16 ----
***************
*** 10336,10342 ****
       * by a signal. */
      while (ret < (long)bufsize)
      {
! 	wlen = vim_write(fd, buf + ret, bufsize - ret);
  	if (wlen < 0)
  	{
  	    if (errno != EINTR)
--- 10328,10334 ----
       * by a signal. */
      while (ret < (long)bufsize)
      {
! 	wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
  	if (wlen < 0)
  	{
  	    if (errno != EINTR)
*** ../vim-7.3.084/src/if_cscope.c	2010-09-21 16:56:29.000000000 +0200
--- src/if_cscope.c	2010-12-17 17:47:02.000000000 +0100
***************
*** 20,28 ****
  #include <sys/stat.h>
  #if defined(UNIX)
  # include <sys/wait.h>
- #else
-     /* not UNIX, must be WIN32 */
- # include "vimio.h"
  #endif
  #include "if_cscope.h"
  
--- 20,25 ----
*** ../vim-7.3.084/src/if_sniff.c	2010-08-15 21:57:25.000000000 +0200
--- src/if_sniff.c	2010-12-17 17:47:20.000000000 +0100
***************
*** 9,15 ****
  
  #ifdef WIN32
  # include <stdio.h>
- # include "vimio.h"
  # include <process.h>
  # include <string.h>
  # include <assert.h>
--- 9,14 ----
*** ../vim-7.3.084/src/main.c	2010-11-16 16:25:46.000000000 +0100
--- src/main.c	2010-12-17 17:47:41.000000000 +0100
***************
*** 7,16 ****
   * See README.txt for an overview of the Vim source code.
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"		/* for close() and dup() */
- #endif
- 
  #define EXTERN
  #include "vim.h"
  
--- 7,12 ----
*** ../vim-7.3.084/src/memfile.c	2010-12-17 16:27:10.000000000 +0100
--- src/memfile.c	2010-12-17 17:47:54.000000000 +0100
***************
*** 32,41 ****
   * file is opened.
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for lseek(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  /*
--- 32,37 ----
*** ../vim-7.3.084/src/memline.c	2010-12-17 16:27:10.000000000 +0100
--- src/memline.c	2010-12-17 17:48:06.000000000 +0100
***************
*** 42,51 ****
   *  mf_get().
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for mch_open(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  #ifndef UNIX		/* it's in os_unix.h for Unix */
--- 42,47 ----
*** ../vim-7.3.084/src/netbeans.c	2010-12-17 12:19:14.000000000 +0100
--- src/netbeans.c	2010-12-17 17:48:19.000000000 +0100
***************
*** 16,25 ****
   * See ":help netbeans-protocol" for explanation.
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for mch_open(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
--- 16,21 ----
*** ../vim-7.3.084/src/os_msdos.c	2010-08-15 21:57:25.000000000 +0200
--- src/os_msdos.c	2010-12-17 17:48:40.000000000 +0100
***************
*** 21,27 ****
   * Some functions are also used for Win16 (MS-Windows 3.1).
   */
  
- #include "vimio.h"
  #include "vim.h"
  
  #include <conio.h>
--- 21,26 ----
*** ../vim-7.3.084/src/os_mswin.c	2010-10-23 14:02:48.000000000 +0200
--- src/os_mswin.c	2010-12-17 17:48:51.000000000 +0100
***************
*** 22,28 ****
  # endif
  #endif
  
- #include "vimio.h"
  #include "vim.h"
  
  #ifdef WIN16
--- 22,27 ----
*** ../vim-7.3.084/src/os_win16.c	2010-08-15 21:57:32.000000000 +0200
--- src/os_win16.c	2010-12-17 17:49:02.000000000 +0100
***************
*** 20,26 ****
  # pragma warn -obs
  #endif
  
- #include "vimio.h"
  #include "vim.h"
  
  #include <dos.h>
--- 20,25 ----
*** ../vim-7.3.084/src/os_win32.c	2010-11-24 12:35:14.000000000 +0100
--- src/os_win32.c	2010-12-17 17:49:11.000000000 +0100
***************
*** 20,26 ****
   * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
   */
  
- #include "vimio.h"
  #include "vim.h"
  
  #ifdef FEAT_MZSCHEME
--- 20,25 ----
*** ../vim-7.3.084/src/spell.c	2010-12-08 17:09:27.000000000 +0100
--- src/spell.c	2010-12-17 17:49:24.000000000 +0100
***************
*** 303,312 ****
   *			    few bytes as possible, see offset2bytes())
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for lseek(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  #if defined(FEAT_SPELL) || defined(PROTO)
--- 303,308 ----
*** ../vim-7.3.084/src/tag.c	2010-09-21 16:56:29.000000000 +0200
--- src/tag.c	2010-12-17 17:49:35.000000000 +0100
***************
*** 11,20 ****
   * Code to handle tags and the tag stack
   */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for lseek(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  /*
--- 11,16 ----
*** ../vim-7.3.084/src/undo.c	2010-12-17 16:27:10.000000000 +0100
--- src/undo.c	2010-12-17 17:49:59.000000000 +0100
***************
*** 81,90 ****
  #define UH_MAGIC 0x18dade	/* value for uh_magic when in use */
  #define UE_MAGIC 0xabc123	/* value for ue_magic when in use */
  
- #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
- # include "vimio.h"	/* for vim_read(), must be before vim.h */
- #endif
- 
  #include "vim.h"
  
  static void u_unch_branch __ARGS((u_header_T *uhp));
--- 81,86 ----
*** ../vim-7.3.084/src/vim.h	2010-12-17 16:27:10.000000000 +0100
--- src/vim.h	2010-12-17 17:51:43.000000000 +0100
***************
*** 27,32 ****
--- 27,37 ----
  # endif
  #endif
  
+ #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) \
+ 	|| defined(__EMX__)
+ # include "vimio.h"
+ #endif
+ 
  /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
  
  #ifdef HAVE_CONFIG_H	/* GNU autoconf (or something else) was here */
*** ../vim-7.3.084/src/version.c	2010-12-17 17:35:05.000000000 +0100
--- src/version.c	2010-12-17 17:55:39.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     85,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
14. Put mosquito netting around your work area. Play a tape of jungle
    sounds all day.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
a6d1e5bc ER	1	To: vim_dev@googlegroups.com
	2	Subject: Patch 7.3.085
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=UTF-8
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.3.085 (after 7.3.083)
	11	Problem: Inconsistency with preproc symbols. void * computation.
	12	Solution: Include vimio.h from vim.h. Add type cast.
	13	Files: src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/fileio.c,
	14	src/if_cscope.c, src/if_sniff.c, src/main.c, src/memfile.c,
	15	src/memline.c, src/netbeans.c, src/os_msdos.c, src/os_mswin.c,
	16	src/os_win16.c, src/os_win32.c, src/spell.c, src/tag.c,
	17	src/undo.c, src/vim.h
	18
	19
	20	*** ../vim-7.3.084/src/eval.c 2010-12-02 21:44:35.000000000 +0100
	21	--- src/eval.c 2010-12-17 17:45:37.000000000 +0100
	22	***************
	23	* 10,18 **
	24	/*
	25	* eval.c: Expression evaluation.
	26	*/
	27	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
	28	- # include "vimio.h" /* for mch_open(), must be before vim.h */
	29	- #endif
	30
	31	#include "vim.h"
	32
	33	--- 10,15 ----
	34	*** ../vim-7.3.084/src/ex_cmds.c 2010-11-24 17:59:27.000000000 +0100
	35	--- src/ex_cmds.c 2010-12-17 17:46:09.000000000 +0100
	36	***************
	37	* 11,20 **
	38	* ex_cmds.c: some functions for command line commands
	39	*/
	40
	41	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
	42	- # include "vimio.h" /* for mch_open(), must be before vim.h */
	43	- #endif
	44	-
	45	#include "vim.h"
	46	#include "version.h"
	47
	48	--- 11,16 ----
	49	*** ../vim-7.3.084/src/ex_cmds2.c 2010-09-21 16:56:29.000000000 +0200
	50	--- src/ex_cmds2.c 2010-12-17 17:46:26.000000000 +0100
	51	***************
	52	* 11,20 **
	53	* ex_cmds2.c: some more functions for command line commands
	54	*/
	55
	56	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
	57	- # include "vimio.h" /* for mch_open(), must be before vim.h */
	58	- #endif
	59	-
	60	#include "vim.h"
	61	#include "version.h"
	62
	63	--- 11,16 ----
	64	*** ../vim-7.3.084/src/fileio.c 2010-12-17 16:27:09.000000000 +0100
65	--- src/fileio.c 2010-12-17 17:52:42.000000000 +0100
66	***************
67	* 11,24 **
68	* fileio.c: read from and write to a file
69	*/
70
71	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
72	- # include "vimio.h" /* for lseek(), must be before vim.h */
73	- #endif
74	-
75	- #if defined __EMX__
76	- # include "vimio.h" /* for mktemp(), CJW 1997-12-03 */
77	- #endif
78	-
79	#include "vim.h"
80
81	#if defined(__TANDEM) \|\| defined(__MINT__)
82	--- 11,16 ----
83	***************
84	* 10336,10342 **
85	* by a signal. */
86	while (ret < (long)bufsize)
87	{
88	! wlen = vim_write(fd, buf + ret, bufsize - ret);
89	if (wlen < 0)
90	{
91	if (errno != EINTR)
92	--- 10328,10334 ----
93	* by a signal. */
94	while (ret < (long)bufsize)
95	{
96	! wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
97	if (wlen < 0)
98	{
99	if (errno != EINTR)
100	*** ../vim-7.3.084/src/if_cscope.c 2010-09-21 16:56:29.000000000 +0200
101	--- src/if_cscope.c 2010-12-17 17:47:02.000000000 +0100
102	***************
103	* 20,28 **
104	#include <sys/stat.h>
105	#if defined(UNIX)
106	# include <sys/wait.h>
107	- #else
108	- /* not UNIX, must be WIN32 */
109	- # include "vimio.h"
110	#endif
111	#include "if_cscope.h"
112
113	--- 20,25 ----
114	*** ../vim-7.3.084/src/if_sniff.c 2010-08-15 21:57:25.000000000 +0200
115	--- src/if_sniff.c 2010-12-17 17:47:20.000000000 +0100
116	***************
117	* 9,15 **
118
119	#ifdef WIN32
120	# include <stdio.h>
121	- # include "vimio.h"
122	# include <process.h>
123	# include <string.h>
124	# include <assert.h>
125	--- 9,14 ----
126	*** ../vim-7.3.084/src/main.c 2010-11-16 16:25:46.000000000 +0100
127	--- src/main.c 2010-12-17 17:47:41.000000000 +0100
128	***************
129	* 7,16 **
130	* See README.txt for an overview of the Vim source code.
131	*/
132
133	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
134	- # include "vimio.h" /* for close() and dup() */
135	- #endif
136	-
137	#define EXTERN
138	#include "vim.h"
139
140	--- 7,12 ----
141	*** ../vim-7.3.084/src/memfile.c 2010-12-17 16:27:10.000000000 +0100
142	--- src/memfile.c 2010-12-17 17:47:54.000000000 +0100
143	***************
144	* 32,41 **
145	* file is opened.
146	*/
147
148	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
149	- # include "vimio.h" /* for lseek(), must be before vim.h */
150	- #endif
151	-
152	#include "vim.h"
153
154	/*
155	--- 32,37 ----
156	*** ../vim-7.3.084/src/memline.c 2010-12-17 16:27:10.000000000 +0100
157	--- src/memline.c 2010-12-17 17:48:06.000000000 +0100
158	***************
159	* 42,51 **
160	* mf_get().
161	*/
162
163	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
164	- # include "vimio.h" /* for mch_open(), must be before vim.h */
165	- #endif
166	-
167	#include "vim.h"
168
169	#ifndef UNIX /* it's in os_unix.h for Unix */
170	--- 42,47 ----
171	*** ../vim-7.3.084/src/netbeans.c 2010-12-17 12:19:14.000000000 +0100
172	--- src/netbeans.c 2010-12-17 17:48:19.000000000 +0100
173	***************
174	* 16,25 **
175	* See ":help netbeans-protocol" for explanation.
176	*/
177
178	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
179	- # include "vimio.h" /* for mch_open(), must be before vim.h */
180	- #endif
181	-
182	#include "vim.h"
183
184	#if defined(FEAT_NETBEANS_INTG) \|\| defined(PROTO)
185	--- 16,21 ----
186	*** ../vim-7.3.084/src/os_msdos.c 2010-08-15 21:57:25.000000000 +0200
187	--- src/os_msdos.c 2010-12-17 17:48:40.000000000 +0100
188	***************
189	* 21,27 **
190	* Some functions are also used for Win16 (MS-Windows 3.1).
191	*/
192
193	- #include "vimio.h"
194	#include "vim.h"
195
196	#include <conio.h>
197	--- 21,26 ----
198	*** ../vim-7.3.084/src/os_mswin.c 2010-10-23 14:02:48.000000000 +0200
199	--- src/os_mswin.c 2010-12-17 17:48:51.000000000 +0100
200	***************
201	* 22,28 **
202	# endif
203	#endif
204
205	- #include "vimio.h"
206	#include "vim.h"
207
208	#ifdef WIN16
209	--- 22,27 ----
210	*** ../vim-7.3.084/src/os_win16.c 2010-08-15 21:57:32.000000000 +0200
211	--- src/os_win16.c 2010-12-17 17:49:02.000000000 +0100
212	***************
213	* 20,26 **
214	# pragma warn -obs
215	#endif
216
217	- #include "vimio.h"
218	#include "vim.h"
219
220	#include <dos.h>
221	--- 20,25 ----
222	*** ../vim-7.3.084/src/os_win32.c 2010-11-24 12:35:14.000000000 +0100
223	--- src/os_win32.c 2010-12-17 17:49:11.000000000 +0100
224	***************
225	* 20,26 **
226	* Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
227	*/
228
229	- #include "vimio.h"
230	#include "vim.h"
231
232	#ifdef FEAT_MZSCHEME
233	--- 20,25 ----
234	*** ../vim-7.3.084/src/spell.c 2010-12-08 17:09:27.000000000 +0100
235	--- src/spell.c 2010-12-17 17:49:24.000000000 +0100
236	***************
237	* 303,312 **
238	* few bytes as possible, see offset2bytes())
239	*/
240
241	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
242	- # include "vimio.h" /* for lseek(), must be before vim.h */
243	- #endif
244	-
245	#include "vim.h"
246
247	#if defined(FEAT_SPELL) \|\| defined(PROTO)
248	--- 303,308 ----
249	*** ../vim-7.3.084/src/tag.c 2010-09-21 16:56:29.000000000 +0200
250	--- src/tag.c 2010-12-17 17:49:35.000000000 +0100
251	***************
252	* 11,20 **
253	* Code to handle tags and the tag stack
254	*/
255
256	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
257	- # include "vimio.h" /* for lseek(), must be before vim.h */
258	- #endif
259	-
260	#include "vim.h"
261
262	/*
263	--- 11,16 ----
264	*** ../vim-7.3.084/src/undo.c 2010-12-17 16:27:10.000000000 +0100
265	--- src/undo.c 2010-12-17 17:49:59.000000000 +0100
266	***************
267	* 81,90 **
268	#define UH_MAGIC 0x18dade /* value for uh_magic when in use */
269	#define UE_MAGIC 0xabc123 /* value for ue_magic when in use */
270
271	- #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64)
272	- # include "vimio.h" /* for vim_read(), must be before vim.h */
273	- #endif
274	-
275	#include "vim.h"
276
277	static void u_unch_branch __ARGS((u_header_T *uhp));
278	--- 81,86 ----
279	*** ../vim-7.3.084/src/vim.h 2010-12-17 16:27:10.000000000 +0100
280	--- src/vim.h 2010-12-17 17:51:43.000000000 +0100
281	***************
282	* 27,32 **
283	--- 27,37 ----
284	# endif
285	#endif
286
287	+ #if defined(MSDOS) \|\| defined(WIN16) \|\| defined(WIN32) \|\| defined(_WIN64) \
288	+ \|\| defined(__EMX__)
289	+ # include "vimio.h"
290	+ #endif
291	+
292	/* ============ the header file puzzle (ca. 50-100 pieces) ========= */
293
294	#ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */
295	*** ../vim-7.3.084/src/version.c 2010-12-17 17:35:05.000000000 +0100
296	--- src/version.c 2010-12-17 17:55:39.000000000 +0100
297	***************
298	* 716,717 **
299	--- 716,719 ----
300	{ /* Add new patch number below this line */
301	+ /**/
302	+ 85,
303	/**/
304
305	--
306	How To Keep A Healthy Level Of Insanity:
307	14. Put mosquito netting around your work area. Play a tape of jungle
308	sounds all day.
309
310	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
311	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
312	\\\ an exciting new programming language -- http://www.Zimbu.org ///
313	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///