0
0
mirror of https://github.com/vim/vim.git synced 2025-09-08 22:13:47 -04:00

patch 7.4.2106

Problem:    Clang warns about missing field in initializer.
Solution:   Define COMMA and use it.  (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2016-07-26 22:02:54 +02:00
parent eec2981bbe
commit ac77aec4da
4 changed files with 8 additions and 6 deletions

View File

@ -4008,6 +4008,7 @@ do_ecmd(
} }
vim_free(new_name); vim_free(new_name);
au_new_curbuf.br_buf = NULL; au_new_curbuf.br_buf = NULL;
au_new_curbuf.br_buf_free_count = 0;
#endif #endif
} }
@ -4389,6 +4390,7 @@ delbuf_msg(char_u *name)
name == NULL ? (char_u *)"" : name); name == NULL ? (char_u *)"" : name);
vim_free(name); vim_free(name);
au_new_curbuf.br_buf = NULL; au_new_curbuf.br_buf = NULL;
au_new_curbuf.br_buf_free_count = 0;
} }
#endif #endif

View File

@ -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 /* When deleting the current buffer, another one must be loaded. If we know
* which one is preferred, au_new_curbuf is set to it */ * 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 /* When deleting a buffer/window and autocmd_busy is TRUE, do not free the
* buffer/window. but link it in the list starting with * 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 #ifdef BACKSLASH_IN_FILENAME
EXTERN char psepc INIT(= '\\'); /* normal path separator character */ EXTERN char psepc INIT(= '\\'); /* normal path separator character */
EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */ EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */
EXTERN char pseps[2] /* normal path separator string */ /* normal path separator string */
# ifdef DO_INIT EXTERN char pseps[2] = INIT(= {'\\' COMMA 0});
= {'\\', 0}
# endif
;
#endif #endif
#ifdef FEAT_VIRTUALEDIT #ifdef FEAT_VIRTUALEDIT

View File

@ -758,6 +758,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 */
/**/
2106,
/**/ /**/
2105, 2105,
/**/ /**/

View File

@ -1765,6 +1765,7 @@ int vim_memcmp(void *, void *, size_t);
# ifndef INIT # ifndef INIT
# define INIT(x) x # define INIT(x) x
# define DO_INIT # define DO_INIT
# define COMMA ,
# endif # endif
#endif #endif