updated for version 7.0111

diff --git a/src/edit.c b/src/edit.c
index bf7096111bc601a9732b928c2df157d8c20a55eb..48883fde6951d2a8e2cc286649db7b9515ac7d34 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -2009,7 +2009,7 @@ ins_compl_add_infercase(str, len, fname, dir, reuse)
        }
 
        /* Copy the original case of the part we typed */
-       vim_strncpy(IObuff, original_text, completion_length);
+       STRNCPY(IObuff, original_text, completion_length);
 
        return ins_compl_add(IObuff, len, fname, dir, reuse);
     }

diff --git a/src/syntax.c b/src/syntax.c
index 54a50612aa88778e2512071c7eb6667df3690069..9058368b60dfff05b63980e3a64ee5b2bde64fa3 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1700,7 +1700,7 @@ get_syntax_attr(col, can_spell)
        return 0;
 
     /* After 'synmaxcol' the attribute is always zero. */
-    if (syn_buf->b_p_smc > 0 && col >= syn_buf->b_p_smc)
+    if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc)
     {
        clear_current_state();
 #ifdef FEAT_EVAL