patch 7.4.2106

Problem:    Clang warns about missing field in initializer.
Solution:   Define COMMA and use it.  (Kazunobu Kuriyama)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 7d8196cdc005998e4b83540cdfd4161356d07baa..2afa5e733a58438dfb1640f1f5456c4c1f5e60ba 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4008,6 +4008,7 @@ do_ecmd(
            }
            vim_free(new_name);
            au_new_curbuf.br_buf = NULL;
+           au_new_curbuf.br_buf_free_count = 0;
 #endif
        }
 
@@ -4389,6 +4390,7 @@ delbuf_msg(char_u *name)
            name == NULL ? (char_u *)"" : name);
     vim_free(name);
     au_new_curbuf.br_buf = NULL;
+    au_new_curbuf.br_buf_free_count = 0;
 }
 #endif
 

diff --git a/src/globals.h b/src/globals.h
index a3d6b4ee24e555253a0af8e03703bdcf7c484d93..4e5f20d216cc7000b8b28d80418e71546bb52fdb 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -384,7 +384,7 @@ EXTERN int  keep_filetype INIT(= FALSE);    /* value for did_filetype when
 
 /* When deleting the current buffer, another one must be loaded.  If we know
  * which one is preferred, au_new_curbuf is set to it */
-EXTERN bufref_T        au_new_curbuf INIT(= {NULL});
+EXTERN bufref_T        au_new_curbuf INIT(= {NULL COMMA 0});
 
 /* When deleting a buffer/window and autocmd_busy is TRUE, do not free the
  * buffer/window. but link it in the list starting with
@@ -1355,11 +1355,8 @@ EXTERN int       term_is_xterm INIT(= FALSE);    /* xterm-like 'term' */
 #ifdef BACKSLASH_IN_FILENAME
 EXTERN char    psepc INIT(= '\\');     /* normal path separator character */
 EXTERN char    psepcN INIT(= '/');     /* abnormal path separator character */
-EXTERN char    pseps[2]                /* normal path separator string */
-# ifdef DO_INIT
-                       = {'\\', 0}
-# endif
-                       ;
+/* normal path separator string */
+EXTERN char    pseps[2] = INIT(= {'\\' COMMA 0});
 #endif
 
 #ifdef FEAT_VIRTUALEDIT

diff --git a/src/version.c b/src/version.c
index 79616c6ae2822eed63b27d670fa9ea2088607b15..cdcb426fa79766edff9af010bc4be7a771e50fd1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2106,
 /**/
     2105,
 /**/

diff --git a/src/vim.h b/src/vim.h
index e2d4cc48fa1544a976c6c8c630f8af8e0c9abff6..498078a4d8636157c9acabcddc4f7b372b6f6c45 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1765,6 +1765,7 @@ int vim_memcmp(void *, void *, size_t);
 # ifndef INIT
 #  define INIT(x) x
 #  define DO_INIT
+#  define COMMA ,
 # endif
 #endif