To: vim_dev@googlegroups.com Subject: Patch 8.1.0718 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0718 Problem: A couple compiler warnings. Solution: Rename shadowed variables. Add UNUSED. Files: src/misc1.c *** ../vim-8.1.0717/src/misc1.c 2019-01-08 23:07:21.305386078 +0100 --- src/misc1.c 2019-01-11 13:59:45.785088325 +0100 *************** *** 2402,2408 **** colnr_T vcol; int old_list; #ifndef FEAT_MBYTE ! char_u buf[2]; #endif /* --- 2402,2408 ---- colnr_T vcol; int old_list; #ifndef FEAT_MBYTE ! char_u cbuf[2]; #endif /* *************** *** 2422,2431 **** */ getvcol(curwin, &curwin->w_cursor, NULL, &vcol, NULL); #ifndef FEAT_MBYTE ! buf[0] = c; ! buf[1] = NUL; ! #endif new_vcol = vcol + chartabsize(buf, vcol); while (oldp[col + oldlen] != NUL && vcol < new_vcol) { vcol += chartabsize(oldp + col + oldlen, vcol); --- 2422,2433 ---- */ getvcol(curwin, &curwin->w_cursor, NULL, &vcol, NULL); #ifndef FEAT_MBYTE ! cbuf[0] = c; ! cbuf[1] = NUL; ! new_vcol = vcol + chartabsize(cbuf, vcol); ! #else new_vcol = vcol + chartabsize(buf, vcol); + #endif while (oldp[col + oldlen] != NUL && vcol < new_vcol) { vcol += chartabsize(oldp + col + oldlen, vcol); *************** *** 3025,3031 **** * When "added" is negative text was deleted. */ void ! inserted_bytes(linenr_T lnum, colnr_T col, int added) { changed_bytes(lnum, col); --- 3027,3033 ---- * When "added" is negative text was deleted. */ void ! inserted_bytes(linenr_T lnum, colnr_T col, int added UNUSED) { changed_bytes(lnum, col); *** ../vim-8.1.0717/src/version.c 2019-01-11 13:42:31.680331155 +0100 --- src/version.c 2019-01-11 14:09:42.388876776 +0100 *************** *** 801,802 **** --- 801,804 ---- { /* Add new patch number below this line */ + /**/ + 718, /**/ -- hundred-and-one symptoms of being an internet addict: 157. You fum through a magazine, you first check to see if it has a web address. /// 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 ///