forked from aniani/vim
updated for version 7.1-283
This commit is contained in:
parent
0fde290e55
commit
cb4cef2206
@ -3009,7 +3009,7 @@ modifier_len(cmd)
|
|||||||
break;
|
break;
|
||||||
if (!isalpha(p[j]) && j >= cmdmods[i].minlen
|
if (!isalpha(p[j]) && j >= cmdmods[i].minlen
|
||||||
&& (p == cmd || cmdmods[i].has_count))
|
&& (p == cmd || cmdmods[i].has_count))
|
||||||
return j + (p - cmd);
|
return j + (int)(p - cmd);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1263,7 +1263,7 @@ EXTERN int echo_wid_arg INIT(= FALSE); /* --echo-wid argument */
|
|||||||
* The value of the --windowid argument.
|
* The value of the --windowid argument.
|
||||||
* For embedding gvim inside another application.
|
* For embedding gvim inside another application.
|
||||||
*/
|
*/
|
||||||
EXTERN int win_socket_id INIT(= 0);
|
EXTERN long_u win_socket_id INIT(= 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
|
#if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL)
|
||||||
|
@ -1400,7 +1400,7 @@ cs_lookup_cmd(eap)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* Store length of eap->arg before it gets modified by strtok(). */
|
/* 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)
|
if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1552,15 +1552,15 @@ early_arg_scan(parmp)
|
|||||||
else if (STRICMP(argv[i], "--socketid") == 0)
|
else if (STRICMP(argv[i], "--socketid") == 0)
|
||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
unsigned int id;
|
long_u id;
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
if (i == argc - 1)
|
if (i == argc - 1)
|
||||||
mainerr_arg_missing((char_u *)argv[i]);
|
mainerr_arg_missing((char_u *)argv[i]);
|
||||||
if (STRNICMP(argv[i+1], "0x", 2) == 0)
|
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
|
else
|
||||||
count = sscanf(argv[i+1], "%u", &id);
|
count = sscanf(argv[i + 1], SCANF_DECIMAL_LONG_U, &id);
|
||||||
if (count != 1)
|
if (count != 1)
|
||||||
mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
|
mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
|
||||||
else
|
else
|
||||||
|
@ -522,7 +522,7 @@ fname2fnum(fm)
|
|||||||
int len;
|
int len;
|
||||||
|
|
||||||
expand_env((char_u *)"~/", NameBuff, MAXPATHL);
|
expand_env((char_u *)"~/", NameBuff, MAXPATHL);
|
||||||
len = STRLEN(NameBuff);
|
len = (int)STRLEN(NameBuff);
|
||||||
vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
|
vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1216,7 +1216,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last)
|
|||||||
int lastbyte = last;
|
int lastbyte = last;
|
||||||
|
|
||||||
oldtext = ml_get(lnum);
|
oldtext = ml_get(lnum);
|
||||||
oldlen = STRLEN(oldtext);
|
oldlen = (int)STRLEN(oldtext);
|
||||||
if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
|
if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
|
||||||
return;
|
return;
|
||||||
if (lastbyte >= oldlen)
|
if (lastbyte >= oldlen)
|
||||||
@ -1241,8 +1241,8 @@ nb_joinlines(linenr_T first, linenr_T other)
|
|||||||
int len_first, len_other;
|
int len_first, len_other;
|
||||||
char_u *p;
|
char_u *p;
|
||||||
|
|
||||||
len_first = STRLEN(ml_get(first));
|
len_first = (int)STRLEN(ml_get(first));
|
||||||
len_other = STRLEN(ml_get(other));
|
len_other = (int)STRLEN(ml_get(other));
|
||||||
p = alloc((unsigned)(len_first + len_other + 1));
|
p = alloc((unsigned)(len_first + len_other + 1));
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
{
|
{
|
||||||
|
@ -337,7 +337,7 @@ pum_redraw()
|
|||||||
|
|
||||||
if (rt != NULL)
|
if (rt != NULL)
|
||||||
{
|
{
|
||||||
len = STRLEN(rt);
|
len = (int)STRLEN(rt);
|
||||||
if (len > pum_width)
|
if (len > pum_width)
|
||||||
{
|
{
|
||||||
for (j = pum_width; j < len; ++j)
|
for (j = pum_width; j < len; ++j)
|
||||||
|
@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
283,
|
||||||
/**/
|
/**/
|
||||||
282,
|
282,
|
||||||
/**/
|
/**/
|
||||||
|
19
src/vim.h
19
src/vim.h
@ -355,16 +355,19 @@ typedef unsigned int int_u;
|
|||||||
* On Win64 longs are 32 bit and pointers 64 bit.
|
* On Win64 longs are 32 bit and pointers 64 bit.
|
||||||
* For printf() and scanf() we need to take care of long_u specifically. */
|
* For printf() and scanf() we need to take care of long_u specifically. */
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
typedef unsigned __int64 long_u;
|
typedef unsigned __int64 long_u;
|
||||||
typedef __int64 long_i;
|
typedef __int64 long_i;
|
||||||
# define SCANF_HEX_LONG_U "%Ix"
|
# define SCANF_HEX_LONG_U "%Ix"
|
||||||
# define PRINTF_HEX_LONG_U "0x%Ix"
|
# define SCANF_DECIMAL_LONG_U "%Iu"
|
||||||
|
# define PRINTF_HEX_LONG_U "0x%Ix"
|
||||||
#else
|
#else
|
||||||
typedef unsigned long long_u;
|
typedef unsigned long long_u;
|
||||||
typedef long long_i;
|
typedef long long_i;
|
||||||
# define SCANF_HEX_LONG_U "%lx"
|
# define SCANF_HEX_LONG_U "%lx"
|
||||||
# define PRINTF_HEX_LONG_U "0x%lx"
|
# define SCANF_DECIMAL_LONG_U "%lu"
|
||||||
|
# define PRINTF_HEX_LONG_U "0x%lx"
|
||||||
#endif
|
#endif
|
||||||
|
#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The characters and attributes cached for the screen.
|
* The characters and attributes cached for the screen.
|
||||||
|
@ -6303,7 +6303,7 @@ match_add(wp, grp, pat, prio, id)
|
|||||||
cur = cur->next;
|
cur = cur->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
|
if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0)
|
||||||
{
|
{
|
||||||
EMSG2(_(e_nogroup), grp);
|
EMSG2(_(e_nogroup), grp);
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user