To: vim_dev@googlegroups.com Subject: Patch 8.2.3355 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3355 Problem: MS-Windows: compiler warning for 64-32 bit conversion. Solution: Add type casts. Files: src/memline.c *** ../vim-8.2.3354/src/memline.c 2021-08-15 22:18:00.719129114 +0200 --- src/memline.c 2021-08-16 21:08:52.056567438 +0200 *************** *** 4000,4006 **** dp->db_txt_start -= extra; #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) if (buf->b_has_textprop) ! old_prop_len = old_len - STRLEN(new_line) - 1; #endif // copy new line into the data block --- 4000,4006 ---- dp->db_txt_start -= extra; #if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP) if (buf->b_has_textprop) ! old_prop_len = old_len - (int)STRLEN(new_line) - 1; #endif // copy new line into the data block *************** *** 4012,4018 **** { // Do not count the size of any text properties. extra += old_prop_len; ! extra -= new_len - STRLEN(new_line) - 1; } if (extra != 0) ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE); --- 4012,4018 ---- { // Do not count the size of any text properties. extra += old_prop_len; ! extra -= new_len - (int)STRLEN(new_line) - 1; } if (extra != 0) ml_updatechunk(buf, lnum, (long)extra, ML_CHNK_UPDLINE); *** ../vim-8.2.3354/src/version.c 2021-08-15 22:18:00.723129106 +0200 --- src/version.c 2021-08-16 21:09:46.036399710 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3355, /**/ -- BRIDGEKEEPER: What is your favorite editor? GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///