OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisionf0cfff4dcc2f7cad78ce86aae0f4cbd3371ce46d (tree)
Time2008-03-17 00:04:34
Authorvimboss
Commitervimboss

Log Message

updated for version 7.1-283

Change Summary

Incremental Difference

diff -r 9fbb40a1228a -r f0cfff4dcc2f src/ex_docmd.c
--- a/src/ex_docmd.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/ex_docmd.c Sun Mar 16 15:04:34 2008 +0000
@@ -3009,7 +3009,7 @@
30093009 break;
30103010 if (!isalpha(p[j]) && j >= cmdmods[i].minlen
30113011 && (p == cmd || cmdmods[i].has_count))
3012- return j + (p - cmd);
3012+ return j + (int)(p - cmd);
30133013 }
30143014 return 0;
30153015 }
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/globals.h
--- a/src/globals.h Sun Mar 16 13:54:13 2008 +0000
+++ b/src/globals.h Sun Mar 16 15:04:34 2008 +0000
@@ -1263,7 +1263,7 @@
12631263 * The value of the --windowid argument.
12641264 * For embedding gvim inside another application.
12651265 */
1266-EXTERN int win_socket_id INIT(= 0);
1266+EXTERN long_u win_socket_id INIT(= 0);
12671267 #endif
12681268
12691269 #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/if_cscope.c
--- a/src/if_cscope.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/if_cscope.c Sun Mar 16 15:04:34 2008 +0000
@@ -1400,7 +1400,7 @@
14001400 return NULL;
14011401
14021402 /* Store length of eap->arg before it gets modified by strtok(). */
1403- eap_arg_len = STRLEN(eap->arg);
1403+ eap_arg_len = (int)STRLEN(eap->arg);
14041404
14051405 if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
14061406 return NULL;
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/main.c
--- a/src/main.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/main.c Sun Mar 16 15:04:34 2008 +0000
@@ -1552,15 +1552,15 @@
15521552 else if (STRICMP(argv[i], "--socketid") == 0)
15531553 # endif
15541554 {
1555- unsigned int id;
1556- int count;
1555+ long_u id;
1556+ int count;
15571557
15581558 if (i == argc - 1)
15591559 mainerr_arg_missing((char_u *)argv[i]);
15601560 if (STRNICMP(argv[i+1], "0x", 2) == 0)
1561- count = sscanf(&(argv[i + 1][2]), "%x", &id);
1561+ count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id);
15621562 else
1563- count = sscanf(argv[i+1], "%u", &id);
1563+ count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
15641564 if (count != 1)
15651565 mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
15661566 else
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/mark.c
--- a/src/mark.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/mark.c Sun Mar 16 15:04:34 2008 +0000
@@ -522,7 +522,7 @@
522522 int len;
523523
524524 expand_env((char_u *)"~/", NameBuff, MAXPATHL);
525- len = STRLEN(NameBuff);
525+ len = (int)STRLEN(NameBuff);
526526 vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
527527 }
528528 else
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/netbeans.c
--- a/src/netbeans.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/netbeans.c Sun Mar 16 15:04:34 2008 +0000
@@ -1216,7 +1216,7 @@
12161216 int lastbyte = last;
12171217
12181218 oldtext = ml_get(lnum);
1219- oldlen = STRLEN(oldtext);
1219+ oldlen = (int)STRLEN(oldtext);
12201220 if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
12211221 return;
12221222 if (lastbyte >= oldlen)
@@ -1241,8 +1241,8 @@
12411241 int len_first, len_other;
12421242 char_u *p;
12431243
1244- len_first = STRLEN(ml_get(first));
1245- len_other = STRLEN(ml_get(other));
1244+ len_first = (int)STRLEN(ml_get(first));
1245+ len_other = (int)STRLEN(ml_get(other));
12461246 p = alloc((unsigned)(len_first + len_other + 1));
12471247 if (p != NULL)
12481248 {
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/popupmnu.c
--- a/src/popupmnu.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/popupmnu.c Sun Mar 16 15:04:34 2008 +0000
@@ -337,7 +337,7 @@
337337
338338 if (rt != NULL)
339339 {
340- len = STRLEN(rt);
340+ len = (int)STRLEN(rt);
341341 if (len > pum_width)
342342 {
343343 for (j = pum_width; j < len; ++j)
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/version.c
--- a/src/version.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/version.c Sun Mar 16 15:04:34 2008 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 283,
671+/**/
670672 282,
671673 /**/
672674 281,
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/vim.h
--- a/src/vim.h Sun Mar 16 13:54:13 2008 +0000
+++ b/src/vim.h Sun Mar 16 15:04:34 2008 +0000
@@ -355,16 +355,19 @@
355355 * On Win64 longs are 32 bit and pointers 64 bit.
356356 * For printf() and scanf() we need to take care of long_u specifically. */
357357 #ifdef _WIN64
358-typedef unsigned __int64 long_u;
359-typedef __int64 long_i;
360-# define SCANF_HEX_LONG_U "%Ix"
361-# define PRINTF_HEX_LONG_U "0x%Ix"
358+typedef unsigned __int64 long_u;
359+typedef __int64 long_i;
360+# define SCANF_HEX_LONG_U "%Ix"
361+# define SCANF_DECIMAL_LONG_U "%Iu"
362+# define PRINTF_HEX_LONG_U "0x%Ix"
362363 #else
363-typedef unsigned long long_u;
364-typedef long long_i;
365-# define SCANF_HEX_LONG_U "%lx"
366-# define PRINTF_HEX_LONG_U "0x%lx"
364+typedef unsigned long long_u;
365+typedef long long_i;
366+# define SCANF_HEX_LONG_U "%lx"
367+# define SCANF_DECIMAL_LONG_U "%lu"
368+# define PRINTF_HEX_LONG_U "0x%lx"
367369 #endif
370+#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U
368371
369372 /*
370373 * The characters and attributes cached for the screen.
diff -r 9fbb40a1228a -r f0cfff4dcc2f src/window.c
--- a/src/window.c Sun Mar 16 13:54:13 2008 +0000
+++ b/src/window.c Sun Mar 16 15:04:34 2008 +0000
@@ -6303,7 +6303,7 @@
63036303 cur = cur->next;
63046304 }
63056305 }
6306- if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
6306+ if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0)
63076307 {
63086308 EMSG2(_(e_nogroup), grp);
63096309 return -1;
Show on old repository browser