updated for version 7.1-283

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 193796f474b91aa03d6969714be34b95c5ee7490..71a7b1bb9cf0816e4684bcf298b50158b34d4004 100644 (file)
--- 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;
 }

diff --git a/src/globals.h b/src/globals.h
index a77f14b07d748c703191d5d1c93be12f50fc8321..469801bb80415a096a2611ffc759179d79cb0a26 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1263,7 +1263,7 @@ EXTERN int        echo_wid_arg INIT(= FALSE);     /* --echo-wid argument */
  * 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)

diff --git a/src/if_cscope.c b/src/if_cscope.c
index e76b58dd7f9a87a871c3a7abb520e8b2a6a0e458..b2d39cf42d8538e1470f9e9e797742795ed5177b 100644 (file)
--- 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;

diff --git a/src/main.c b/src/main.c
index 07390a9327679f34e949248731aec42a10a1f194..2a02615f43f4abf0b8c66741920b98fb732ced22 100644 (file)
--- 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

diff --git a/src/mark.c b/src/mark.c
index 2accbba1fb4cf61885ccd8875d435e3325224734..742896986002d2f6603e00598a97bf3bf6f50b1d 100644 (file)
--- 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

diff --git a/src/netbeans.c b/src/netbeans.c
index e3e32008e94fc9e616e3571f9a8254c2bb85e6a8..ed415a5ccbd69b580e6fdfddd283b2abd089f0b7 100644 (file)
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -1216,7 +1216,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last)
     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 other)
     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)
     {

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 4dd3a94882dbf8da0b60caa1fad776e44669d243..1d747a6bf366738f60deea531a9e3addd29647dd 100644 (file)
--- 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)

diff --git a/src/version.c b/src/version.c
index 9e73bb989cb92074c727c8ff4356e5a570cab5d9..b8119195588401e4cc52148895de589a04f36a06 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    283,
 /**/
     282,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 6c2cde5b02927228545473ef60b1a8163395200e..d93bec1545302607e0453304d40afa2e2d69ab9b 100644 (file)
--- 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.

diff --git a/src/window.c b/src/window.c
index 74e36468728d4e86be52d54ae9061d5abdfc21c3..584b9a48566c1802e8f70924b59c4499fe97fc73 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -6303,7 +6303,7 @@ match_add(wp, grp, pat, prio, id)
            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);
        return -1;