Mercurial > vim
diff src/normal.c @ 27428:3f8a57b8c7d8 v8.2.4242
patch 8.2.4242: put in Visual mode cannot be repeated
Commit: https://github.com/vim/vim/commit/fb55207ed17918c8a2a6cadf5ad9d5fcf686a7ab
Author: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Fri Jan 28 16:01:13 2022 +0000
patch 8.2.4242: put in Visual mode cannot be repeated
Problem: Put in Visual mode cannot be repeated.
Solution: Use "P" to put without yanking the deleted text into the unnamed
register. (Shougo Matsushita, closes #9591)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 28 Jan 2022 17:15:03 +0100 |
parents | 41e0dcf38521 |
children | 4050f0554902 |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -4661,8 +4661,8 @@ nv_bracket_block(cmdarg_T *cap, pos_T *o } // found start/end of other method: go to match else if ((pos = findmatchlimit(cap->oap, findc, - (cap->cmdchar == '[') ? FM_BACKWARD : FM_FORWARD, - 0)) == NULL) + (cap->cmdchar == '[') ? FM_BACKWARD : FM_FORWARD, + 0)) == NULL) n = 0; else curwin->w_cursor = *pos; @@ -7505,6 +7505,8 @@ nv_put_opt(cmdarg_T *cap, int fix_indent int was_visual = FALSE; int dir; int flags = 0; + int save_unnamed = FALSE; + yankreg_T *old_y_current, *old_y_previous; if (cap->oap->op_type != OP_NOP) { @@ -7551,6 +7553,7 @@ nv_put_opt(cmdarg_T *cap, int fix_indent // overwrites if the old contents is being put. was_visual = TRUE; regname = cap->oap->regname; + save_unnamed = cap->cmdchar == 'P'; #ifdef FEAT_CLIPBOARD adjust_clip_reg(®name); #endif @@ -7568,6 +7571,11 @@ nv_put_opt(cmdarg_T *cap, int fix_indent } // Now delete the selected text. Avoid messages here. + if (save_unnamed) + { + old_y_current = get_y_current(); + old_y_previous = get_y_previous(); + } cap->cmdchar = 'd'; cap->nchar = NUL; cap->oap->regname = NUL; @@ -7577,6 +7585,12 @@ nv_put_opt(cmdarg_T *cap, int fix_indent empty = (curbuf->b_ml.ml_flags & ML_EMPTY); --msg_silent; + if (save_unnamed) + { + set_y_current(old_y_current); + set_y_previous(old_y_previous); + } + // delete PUT_LINE_BACKWARD; cap->oap->regname = regname;