To: vim_dev@googlegroups.com Subject: Patch 7.4.2106 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2106 Problem: Clang warns about missing field in initializer. Solution: Define COMMA and use it. (Kazunobu Kuriyama) Files: src/ex_cmds.c, src/globals.h, src/vim.h *** ../vim-7.4.2105/src/ex_cmds.c 2016-07-24 21:58:39.696057708 +0200 --- src/ex_cmds.c 2016-07-26 21:53:09.869213378 +0200 *************** *** 4008,4013 **** --- 4008,4014 ---- } vim_free(new_name); au_new_curbuf.br_buf = NULL; + au_new_curbuf.br_buf_free_count = 0; #endif } *************** *** 4389,4394 **** --- 4390,4396 ---- name == NULL ? (char_u *)"" : name); vim_free(name); au_new_curbuf.br_buf = NULL; + au_new_curbuf.br_buf_free_count = 0; } #endif *** ../vim-7.4.2105/src/globals.h 2016-07-24 21:58:39.704057634 +0200 --- src/globals.h 2016-07-26 21:56:40.839231460 +0200 *************** *** 384,390 **** /* 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}); /* When deleting a buffer/window and autocmd_busy is TRUE, do not free the * buffer/window. but link it in the list starting with --- 384,390 ---- /* 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 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,1365 **** #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 ! ; #endif #ifdef FEAT_VIRTUALEDIT --- 1355,1362 ---- #ifdef BACKSLASH_IN_FILENAME EXTERN char psepc INIT(= '\\'); /* normal path separator character */ EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */ ! /* normal path separator string */ ! EXTERN char pseps[2] = INIT(= {'\\' COMMA 0}); #endif #ifdef FEAT_VIRTUALEDIT *** ../vim-7.4.2105/src/vim.h 2016-07-20 00:10:44.484250033 +0200 --- src/vim.h 2016-07-26 21:53:09.873213340 +0200 *************** *** 1765,1770 **** --- 1765,1771 ---- # ifndef INIT # define INIT(x) x # define DO_INIT + # define COMMA , # endif #endif *** ../vim-7.4.2105/src/version.c 2016-07-26 21:26:34.424242580 +0200 --- src/version.c 2016-07-26 21:54:35.400409648 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2106, /**/ -- MONK: ... and the Lord spake, saying, "First shalt thou take out the Holy Pin, then shalt thou count to three, no more, no less. Three shalt be the number thou shalt count, and the number of the counting shalt be three. Four shalt thou not count, neither count thou two, excepting that thou then proceed to three. Five is right out. Once the number three, being the third number, be reached, then lobbest thou thy Holy Hand Grenade of Antioch towards thou foe, who being naughty in my sight, shall snuff it. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///