[packages/vim.git] / 7.1.283

To: vim-dev@vim.org
Subject: Patch 7.1.283
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 7.1.283
Problem:    Non-extra part for 7.1.282.
Solution:   Various changes.
Files:	    src/ex_docmd.c, src/globals.h, src/if_cscope.c, src/main.c,
	    src/mark.c, src/netbeans.c, src/popupmnu.c, src/vim.h,
	    src/window.c


*** ../vim-7.1.282/src/ex_docmd.c	Mon Mar 10 21:33:52 2008
--- src/ex_docmd.c	Wed Mar 12 14:53:18 2008
***************
*** 3009,3015 ****
  		break;
  	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
  					&& (p == cmd || cmdmods[i].has_count))
! 	    return j + (p - cmd);
      }
      return 0;
  }
--- 3009,3015 ----
  		break;
  	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
  					&& (p == cmd || cmdmods[i].has_count))
! 	    return j + (int)(p - cmd);
      }
      return 0;
  }
*** ../vim-7.1.282/src/globals.h	Tue Jan  1 14:16:42 2008
--- src/globals.h	Wed Mar 12 14:54:00 2008
***************
*** 1263,1269 ****
   * The value of the --windowid argument.
   * For embedding gvim inside another application.
   */
! EXTERN int	win_socket_id INIT(= 0);
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
--- 1263,1269 ----
   * The value of the --windowid argument.
   * For embedding gvim inside another application.
   */
! EXTERN long_u	win_socket_id INIT(= 0);
  #endif
  
  #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
*** ../vim-7.1.282/src/if_cscope.c	Sun Mar 16 13:09:14 2008
--- src/if_cscope.c	Sun Mar 16 13:05:51 2008
***************
*** 1400,1406 ****
  	return NULL;
  
      /* Store length of eap->arg before it gets modified by strtok(). */
!     eap_arg_len = STRLEN(eap->arg);
  
      if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
  	return NULL;
--- 1400,1406 ----
  	return NULL;
  
      /* Store length of eap->arg before it gets modified by strtok(). */
!     eap_arg_len = (int)STRLEN(eap->arg);
  
      if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
  	return NULL;
*** ../vim-7.1.282/src/main.c	Sun Jan 13 16:17:02 2008
--- src/main.c	Wed Mar 12 15:04:30 2008
***************
*** 1552,1566 ****
  	else if (STRICMP(argv[i], "--socketid") == 0)
  #  endif
  	{
! 	    unsigned int    id;
! 	    int		    count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), "%x", &id);
  	    else
! 		count = sscanf(argv[i+1], "%u", &id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
--- 1552,1566 ----
  	else if (STRICMP(argv[i], "--socketid") == 0)
  #  endif
  	{
! 	    long_u	id;
! 	    int		count;
  
  	    if (i == argc - 1)
  		mainerr_arg_missing((char_u *)argv[i]);
  	    if (STRNICMP(argv[i+1], "0x", 2) == 0)
! 		count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id);
  	    else
! 		count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
  	    if (count != 1)
  		mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
  	    else
*** ../vim-7.1.282/src/mark.c	Wed Feb 13 12:41:30 2008
--- src/mark.c	Wed Mar 12 15:10:14 2008
***************
*** 522,528 ****
  	    int len;
  
  	    expand_env((char_u *)"~/", NameBuff, MAXPATHL);
! 	    len = STRLEN(NameBuff);
  	    vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
  	}
  	else
--- 522,528 ----
  	    int len;
  
  	    expand_env((char_u *)"~/", NameBuff, MAXPATHL);
! 	    len = (int)STRLEN(NameBuff);
  	    vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
  	}
  	else
*** ../vim-7.1.282/src/netbeans.c	Fri Jan 18 11:40:02 2008
--- src/netbeans.c	Wed Mar 12 15:11:42 2008
***************
*** 1216,1222 ****
      int lastbyte = last;
  
      oldtext = ml_get(lnum);
!     oldlen = STRLEN(oldtext);
      if (first >= (colnr_T)oldlen || oldlen == 0)  /* just in case */
  	return;
      if (lastbyte >= oldlen)
--- 1216,1222 ----
      int lastbyte = last;
  
      oldtext = ml_get(lnum);
!     oldlen = (int)STRLEN(oldtext);
      if (first >= (colnr_T)oldlen || oldlen == 0)  /* just in case */
  	return;
      if (lastbyte >= oldlen)
***************
*** 1241,1248 ****
      int len_first, len_other;
      char_u *p;
  
!     len_first = STRLEN(ml_get(first));
!     len_other = STRLEN(ml_get(other));
      p = alloc((unsigned)(len_first + len_other + 1));
      if (p != NULL)
      {
--- 1241,1248 ----
      int len_first, len_other;
      char_u *p;
  
!     len_first = (int)STRLEN(ml_get(first));
!     len_other = (int)STRLEN(ml_get(other));
      p = alloc((unsigned)(len_first + len_other + 1));
      if (p != NULL)
      {
*** ../vim-7.1.282/src/popupmnu.c	Wed Aug  8 22:48:16 2007
--- src/popupmnu.c	Wed Mar 12 15:17:21 2008
***************
*** 337,343 ****
  
  				if (rt != NULL)
  				{
! 				    len = STRLEN(rt);
  				    if (len > pum_width)
  				    {
  					for (j = pum_width; j < len; ++j)
--- 337,343 ----
  
  				if (rt != NULL)
  				{
! 				    len = (int)STRLEN(rt);
  				    if (len > pum_width)
  				    {
  					for (j = pum_width; j < len; ++j)
*** ../vim-7.1.282/src/vim.h	Sat Mar 15 13:10:57 2008
--- src/vim.h	Thu Mar 13 23:39:21 2008
***************
*** 355,370 ****
   * On Win64 longs are 32 bit and pointers 64 bit.
   * For printf() and scanf() we need to take care of long_u specifically. */
  #ifdef _WIN64
! typedef unsigned __int64 long_u;
! typedef		 __int64 long_i;
! # define SCANF_HEX_LONG_U  "%Ix"
! # define PRINTF_HEX_LONG_U "0x%Ix"
! #else
! typedef unsigned long	long_u;
! typedef		 long	long_i;
! # define SCANF_HEX_LONG_U  "%lx"
! # define PRINTF_HEX_LONG_U "0x%lx"
  #endif
  
  /*
   * The characters and attributes cached for the screen.
--- 355,373 ----
   * On Win64 longs are 32 bit and pointers 64 bit.
   * For printf() and scanf() we need to take care of long_u specifically. */
  #ifdef _WIN64
! typedef unsigned __int64        long_u;
! typedef		 __int64        long_i;
! # define SCANF_HEX_LONG_U       "%Ix"
! # define SCANF_DECIMAL_LONG_U   "%Iu"
! # define PRINTF_HEX_LONG_U      "0x%Ix"
! #else
! typedef unsigned long	        long_u;
! typedef		 long	        long_i;
! # define SCANF_HEX_LONG_U       "%lx"
! # define SCANF_DECIMAL_LONG_U   "%lu"
! # define PRINTF_HEX_LONG_U      "0x%lx"
  #endif
+ #define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U
  
  /*
   * The characters and attributes cached for the screen.
*** ../vim-7.1.282/src/window.c	Sat Sep 29 14:15:00 2007
--- src/window.c	Wed Mar 12 15:22:10 2008
***************
*** 6303,6309 ****
  	    cur = cur->next;
  	}
      }
!     if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
      {
  	EMSG2(_(e_nogroup), grp);
  	return -1;
--- 6303,6309 ----
  	    cur = cur->next;
  	}
      }
!     if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0)
      {
  	EMSG2(_(e_nogroup), grp);
  	return -1;
*** ../vim-7.1.282/src/version.c	Sun Mar 16 14:52:53 2008
--- src/version.c	Sun Mar 16 16:00:17 2008
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     283,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
139. You down your lunch in five minutes, at your desk, so you can
     spend the rest of the hour surfing the Net.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
21166df1 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 7.1.283
	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 7.1.283
	11	Problem: Non-extra part for 7.1.282.
	12	Solution: Various changes.
	13	Files: src/ex_docmd.c, src/globals.h, src/if_cscope.c, src/main.c,
	14	src/mark.c, src/netbeans.c, src/popupmnu.c, src/vim.h,
	15	src/window.c
	16
	17
	18	*** ../vim-7.1.282/src/ex_docmd.c Mon Mar 10 21:33:52 2008
	19	--- src/ex_docmd.c Wed Mar 12 14:53:18 2008
	20	***************
	21	* 3009,3015 **
	22	break;
	23	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
	24	&& (p == cmd \|\| cmdmods[i].has_count))
	25	! return j + (p - cmd);
	26	}
	27	return 0;
	28	}
	29	--- 3009,3015 ----
	30	break;
	31	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
	32	&& (p == cmd \|\| cmdmods[i].has_count))
	33	! return j + (int)(p - cmd);
	34	}
	35	return 0;
	36	}
	37	*** ../vim-7.1.282/src/globals.h Tue Jan 1 14:16:42 2008
	38	--- src/globals.h Wed Mar 12 14:54:00 2008
	39	***************
	40	* 1263,1269 **
	41	* The value of the --windowid argument.
	42	* For embedding gvim inside another application.
	43	*/
	44	! EXTERN int win_socket_id INIT(= 0);
	45	#endif
	46
	47	#if defined(FEAT_CLIENTSERVER) \|\| defined(FEAT_EVAL)
	48	--- 1263,1269 ----
	49	* The value of the --windowid argument.
	50	* For embedding gvim inside another application.
	51	*/
	52	! EXTERN long_u win_socket_id INIT(= 0);
	53	#endif
	54
	55	#if defined(FEAT_CLIENTSERVER) \|\| defined(FEAT_EVAL)
	56	*** ../vim-7.1.282/src/if_cscope.c Sun Mar 16 13:09:14 2008
	57	--- src/if_cscope.c Sun Mar 16 13:05:51 2008
	58	***************
	59	* 1400,1406 **
	60	return NULL;
	61
	62	/* Store length of eap->arg before it gets modified by strtok(). */
	63	! eap_arg_len = STRLEN(eap->arg);
	64
65	if ((stok = strtok((char )(eap->arg), (const char )" ")) == NULL)
66	return NULL;
67	--- 1400,1406 ----
68	return NULL;
69
70	/* Store length of eap->arg before it gets modified by strtok(). */
71	! eap_arg_len = (int)STRLEN(eap->arg);
72
73	if ((stok = strtok((char )(eap->arg), (const char )" ")) == NULL)
74	return NULL;
75	*** ../vim-7.1.282/src/main.c Sun Jan 13 16:17:02 2008
76	--- src/main.c Wed Mar 12 15:04:30 2008
77	***************
78	* 1552,1566 **
79	else if (STRICMP(argv[i], "--socketid") == 0)
80	# endif
81	{
82	! unsigned int id;
83	! int count;
84
85	if (i == argc - 1)
86	mainerr_arg_missing((char_u *)argv[i]);
87	if (STRNICMP(argv[i+1], "0x", 2) == 0)
88	! count = sscanf(&(argv[i + 1][2]), "%x", &id);
89	else
90	! count = sscanf(argv[i+1], "%u", &id);
91	if (count != 1)
92	mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
93	else
94	--- 1552,1566 ----
95	else if (STRICMP(argv[i], "--socketid") == 0)
96	# endif
97	{
98	! long_u id;
99	! int count;
100
101	if (i == argc - 1)
102	mainerr_arg_missing((char_u *)argv[i]);
103	if (STRNICMP(argv[i+1], "0x", 2) == 0)
104	! count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id);
105	else
106	! count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
107	if (count != 1)
108	mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
109	else
110	*** ../vim-7.1.282/src/mark.c Wed Feb 13 12:41:30 2008
111	--- src/mark.c Wed Mar 12 15:10:14 2008
112	***************
113	* 522,528 **
114	int len;
115
116	expand_env((char_u *)"~/", NameBuff, MAXPATHL);
117	! len = STRLEN(NameBuff);
118	vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
119	}
120	else
121	--- 522,528 ----
122	int len;
123
124	expand_env((char_u *)"~/", NameBuff, MAXPATHL);
125	! len = (int)STRLEN(NameBuff);
126	vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
127	}
128	else
129	*** ../vim-7.1.282/src/netbeans.c Fri Jan 18 11:40:02 2008
130	--- src/netbeans.c Wed Mar 12 15:11:42 2008
131	***************
132	* 1216,1222 **
133	int lastbyte = last;
134
135	oldtext = ml_get(lnum);
136	! oldlen = STRLEN(oldtext);
137	if (first >= (colnr_T)oldlen \|\| oldlen == 0) /* just in case */
138	return;
139	if (lastbyte >= oldlen)
140	--- 1216,1222 ----
141	int lastbyte = last;
142
143	oldtext = ml_get(lnum);
144	! oldlen = (int)STRLEN(oldtext);
145	if (first >= (colnr_T)oldlen \|\| oldlen == 0) /* just in case */
146	return;
147	if (lastbyte >= oldlen)
148	***************
149	* 1241,1248 **
150	int len_first, len_other;
151	char_u *p;
152
153	! len_first = STRLEN(ml_get(first));
154	! len_other = STRLEN(ml_get(other));
155	p = alloc((unsigned)(len_first + len_other + 1));
156	if (p != NULL)
157	{
158	--- 1241,1248 ----
159	int len_first, len_other;
160	char_u *p;
161
162	! len_first = (int)STRLEN(ml_get(first));
163	! len_other = (int)STRLEN(ml_get(other));
164	p = alloc((unsigned)(len_first + len_other + 1));
165	if (p != NULL)
166	{
167	*** ../vim-7.1.282/src/popupmnu.c Wed Aug 8 22:48:16 2007
168	--- src/popupmnu.c Wed Mar 12 15:17:21 2008
169	***************
170	* 337,343 **
171
172	if (rt != NULL)
173	{
174	! len = STRLEN(rt);
175	if (len > pum_width)
176	{
177	for (j = pum_width; j < len; ++j)
178	--- 337,343 ----
179
180	if (rt != NULL)
181	{
182	! len = (int)STRLEN(rt);
183	if (len > pum_width)
184	{
185	for (j = pum_width; j < len; ++j)
186	*** ../vim-7.1.282/src/vim.h Sat Mar 15 13:10:57 2008
187	--- src/vim.h Thu Mar 13 23:39:21 2008
188	***************
189	* 355,370 **
190	* On Win64 longs are 32 bit and pointers 64 bit.
191	* For printf() and scanf() we need to take care of long_u specifically. */
192	#ifdef _WIN64
193	! typedef unsigned __int64 long_u;
194	! typedef __int64 long_i;
195	! # define SCANF_HEX_LONG_U "%Ix"
196	! # define PRINTF_HEX_LONG_U "0x%Ix"
197	! #else
198	! typedef unsigned long long_u;
199	! typedef long long_i;
200	! # define SCANF_HEX_LONG_U "%lx"
201	! # define PRINTF_HEX_LONG_U "0x%lx"
202	#endif
203
204	/*
205	* The characters and attributes cached for the screen.
206	--- 355,373 ----
207	* On Win64 longs are 32 bit and pointers 64 bit.
208	* For printf() and scanf() we need to take care of long_u specifically. */
209	#ifdef _WIN64
210	! typedef unsigned __int64 long_u;
211	! typedef __int64 long_i;
212	! # define SCANF_HEX_LONG_U "%Ix"
213	! # define SCANF_DECIMAL_LONG_U "%Iu"
214	! # define PRINTF_HEX_LONG_U "0x%Ix"
215	! #else
216	! typedef unsigned long long_u;
217	! typedef long long_i;
218	! # define SCANF_HEX_LONG_U "%lx"
219	! # define SCANF_DECIMAL_LONG_U "%lu"
220	! # define PRINTF_HEX_LONG_U "0x%lx"
221	#endif
222	+ #define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U
223
224	/*
225	* The characters and attributes cached for the screen.
226	*** ../vim-7.1.282/src/window.c Sat Sep 29 14:15:00 2007
227	--- src/window.c Wed Mar 12 15:22:10 2008
228	***************
229	* 6303,6309 **
230	cur = cur->next;
231	}
232	}
233	! if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
234	{
235	EMSG2(_(e_nogroup), grp);
236	return -1;
237	--- 6303,6309 ----
238	cur = cur->next;
239	}
240	}
241	! if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0)
242	{
243	EMSG2(_(e_nogroup), grp);
244	return -1;
245	*** ../vim-7.1.282/src/version.c Sun Mar 16 14:52:53 2008
246	--- src/version.c Sun Mar 16 16:00:17 2008
247	***************
248	* 668,669 **
249	--- 668,671 ----
250	{ /* Add new patch number below this line */
251	+ /**/
252	+ 283,
253	/**/
254
255	--
256	hundred-and-one symptoms of being an internet addict:
257	139. You down your lunch in five minutes, at your desk, so you can
258	spend the rest of the hour surfing the Net.
259
260	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
261	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
262	\\\ download, build and distribute -- http://www.A-A-P.org ///
263	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///