aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.0.1779: deleting in a block selection causes problems

Browse Source 
Problem:    Deleting in a block selection causes problems.
Solution:   Check the length of the line before adding bd.textcol and
            bd.textlen. (Christian Brabandt, closes #2825)
This commit is contained in:
Bram Moolenaar
2018-04-30 17:21:03 +02:00
parent b07bbb0d29
commit 35e802e713
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ops.c
View File

@@ -2703,6 +2703,8 @@ op_insert(oparg_T *oap, long count1)
{
struct block_def bd2;
int did_indent = FALSE;
size_t len;
int add;
/* If indent kicked in, the firstline might have changed
* but only do that, if the indent actually increased. */
@@ -2781,9 +2783,15 @@ op_insert(oparg_T *oap, long count1)
* Subsequent calls to ml_get() flush the firstline data - take a
* copy of the required string.
*/
firstline = ml_get(oap->start.lnum) + bd.textcol;
firstline = ml_get(oap->start.lnum);
len = STRLEN(firstline);
add = bd.textcol;
if (oap->op_type == OP_APPEND)
firstline += bd.textlen;
add += bd.textlen;
if ((size_t)add > len)
firstline += len; // short line, point to the NUL
else
firstline += add;
if (pre_textlen >= 0
&& (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
{