thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0999: use register one too often and not properly tested

Browse Source 
Problem:    Use register one too often and not properly tested.
Solution:   Do not always use register one when specifying a register.
            (closes #4085)  Add more tests.
This commit is contained in:
Bram Moolenaar
2019-03-08 09:50:52 +01:00
parent 19a66858a5
commit 9d7fdd403a
3 changed files with 90 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ops.c
View File

@@ -1747,7 +1747,6 @@ op_delete(oparg_T *oap)
struct block_def bd;
linenr_T old_lcount = curbuf->b_ml.ml_line_count;
int did_yank = FALSE;
int orig_regname = oap->regname;
if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */
return OK;
@@ -1833,12 +1832,13 @@ op_delete(oparg_T *oap)
/*
* Put deleted text into register 1 and shift number registers if the
* delete contains a line break, or when a regname has been specified.
* delete contains a line break, or when using a specific operator (Vi
* compatible)
* Use the register name from before adjust_clip_reg() may have
* changed it.
*/
if (orig_regname != 0 || oap->motion_type == MLINE
|| oap->line_count > 1 || oap->use_reg_one)
if (oap->motion_type == MLINE || oap->line_count > 1
|| oap->use_reg_one)
{
shift_delete_registers();
if (op_yank(oap, TRUE, FALSE) == OK)