Mercurial > vim
changeset 1570:f0cfff4dcc2f v7.1.283
updated for version 7.1-283
| author | vimboss |
|---|---|
| date | Sun, 16 Mar 2008 15:04:34 +0000 |
| parents | 9fbb40a1228a |
| children | 26d879bcab3a |
| 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/version.c src/vim.h src/window.c |
| diffstat | 10 files changed, 26 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3009,7 +3009,7 @@ modifier_len(cmd) break; if (!isalpha(p[j]) && j >= cmdmods[i].minlen && (p == cmd || cmdmods[i].has_count)) - return j + (p - cmd); + return j + (int)(p - cmd); } return 0; }
--- a/src/globals.h +++ b/src/globals.h @@ -1263,7 +1263,7 @@ EXTERN int echo_wid_arg INIT(= FALSE); / * The value of the --windowid argument. * For embedding gvim inside another application. */ -EXTERN int win_socket_id INIT(= 0); +EXTERN long_u win_socket_id INIT(= 0); #endif #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
--- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -1400,7 +1400,7 @@ cs_lookup_cmd(eap) return NULL; /* Store length of eap->arg before it gets modified by strtok(). */ - eap_arg_len = STRLEN(eap->arg); + eap_arg_len = (int)STRLEN(eap->arg); if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL) return NULL;
--- a/src/main.c +++ b/src/main.c @@ -1552,15 +1552,15 @@ early_arg_scan(parmp) else if (STRICMP(argv[i], "--socketid") == 0) # endif { - unsigned int id; - int count; + 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]), "%x", &id); + count = sscanf(&(argv[i + 1][2]), SCANF_HEX_LONG_U, &id); else - count = sscanf(argv[i+1], "%u", &id); + count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id); if (count != 1) mainerr(ME_INVALID_ARG, (char_u *)argv[i]); else
--- a/src/mark.c +++ b/src/mark.c @@ -522,7 +522,7 @@ fname2fnum(fm) int len; expand_env((char_u *)"~/", NameBuff, MAXPATHL); - len = STRLEN(NameBuff); + len = (int)STRLEN(NameBuff); vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); } else
--- a/src/netbeans.c +++ b/src/netbeans.c @@ -1216,7 +1216,7 @@ nb_partialremove(linenr_T lnum, colnr_T int lastbyte = last; oldtext = ml_get(lnum); - oldlen = STRLEN(oldtext); + oldlen = (int)STRLEN(oldtext); if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */ return; if (lastbyte >= oldlen) @@ -1241,8 +1241,8 @@ nb_joinlines(linenr_T first, linenr_T ot int len_first, len_other; char_u *p; - len_first = STRLEN(ml_get(first)); - len_other = STRLEN(ml_get(other)); + 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) {
--- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -337,7 +337,7 @@ pum_redraw() if (rt != NULL) { - len = STRLEN(rt); + len = (int)STRLEN(rt); if (len > pum_width) { for (j = pum_width; j < len; ++j)
--- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 283, +/**/ 282, /**/ 281,
--- a/src/vim.h +++ b/src/vim.h @@ -355,16 +355,19 @@ typedef unsigned int int_u; * 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" +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 PRINTF_HEX_LONG_U "0x%lx" +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.