To: vim_dev@googlegroups.com Subject: Patch 8.1.2215 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2215 Problem: Unreachable code in adjusting text prop columns. Solution: Remove the code. (Christian Brabandt) Files: src/textprop.c *** ../vim-8.1.2214/src/textprop.c 2019-08-25 23:07:34.883383627 +0200 --- src/textprop.c 2019-10-25 21:48:03.898340694 +0200 *************** *** 1067,1079 **** if (bytes_added > 0 && (tmp_prop.tp_col >= col + (start_incl ? 2 : 1))) { ! if (tmp_prop.tp_col < col + (start_incl ? 2 : 1)) ! { ! tmp_prop.tp_len += (tmp_prop.tp_col - 1 - col) + bytes_added; ! tmp_prop.tp_col = col + 1; ! } ! else ! tmp_prop.tp_col += bytes_added; // Save for undo if requested and not done yet. if ((flags & APC_SAVE_FOR_UNDO) && !dirty) u_savesub(lnum); --- 1067,1073 ---- if (bytes_added > 0 && (tmp_prop.tp_col >= col + (start_incl ? 2 : 1))) { ! tmp_prop.tp_col += bytes_added; // Save for undo if requested and not done yet. if ((flags & APC_SAVE_FOR_UNDO) && !dirty) u_savesub(lnum); *** ../vim-8.1.2214/src/version.c 2019-10-24 22:32:27.692284767 +0200 --- src/version.c 2019-10-25 21:48:57.586120878 +0200 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2215, /**/ -- At some point in the project somebody will start whining about the need to determine the project "requirements". This involves interviewing people who don't know what they want but, curiously, know exactly when they need it. (Scott Adams - The Dilbert principle) /// 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 ///