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

patch 8.1.1373: "[p" in Visual mode puts in wrong line

Browse Source 
Problem:    "[p" in Visual mode puts in wrong line.
Solution:   Call nv_put() instead of duplicating the functionality.
            (closes #4408)
This commit is contained in:
Bram Moolenaar
2019-05-23 23:27:36 +02:00
parent 1c6fd1e100
commit 0ab190c057
3 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/normal.c
View File

@@ -143,6 +143,7 @@ static void nv_at(cmdarg_T *cap);
static void nv_halfpage(cmdarg_T *cap);
static void nv_join(cmdarg_T *cap);
static void nv_put(cmdarg_T *cap);
static void nv_put_opt(cmdarg_T *cap, int fix_indent);
static void nv_open(cmdarg_T *cap);
#ifdef FEAT_NETBEANS_INTG
static void nv_nbcmd(cmdarg_T *cap);
@@ -6583,57 +6584,7 @@ nv_brackets(cmdarg_T *cap)
*/
else if (cap->nchar == 'p' || cap->nchar == 'P')
{
if (!checkclearop(cap->oap))
{
int dir = (cap->cmdchar == ']' && cap->nchar == 'p')
? FORWARD : BACKWARD;
int regname = cap->oap->regname;
int was_visual = VIsual_active;
int line_count = curbuf->b_ml.ml_line_count;
pos_T start, end;
if (VIsual_active)
{
start = LTOREQ_POS(VIsual, curwin->w_cursor)
? VIsual : curwin->w_cursor;
end = EQUAL_POS(start,VIsual) ? curwin->w_cursor : VIsual;
curwin->w_cursor = (dir == BACKWARD ? start : end);
}
# ifdef FEAT_CLIPBOARD
adjust_clip_reg(&regname);
# endif
prep_redo_cmd(cap);
do_put(regname, dir, cap->count1, PUT_FIXINDENT);
if (was_visual)
{
VIsual = start;
curwin->w_cursor = end;
if (dir == BACKWARD)
{
/* adjust lines */
VIsual.lnum += curbuf->b_ml.ml_line_count - line_count;
curwin->w_cursor.lnum +=
curbuf->b_ml.ml_line_count - line_count;
}
VIsual_active = TRUE;
if (VIsual_mode == 'V')
{
/* delete visually selected lines */
cap->cmdchar = 'd';
cap->nchar = NUL;
cap->oap->regname = regname;
nv_operator(cap);
do_pending_operator(cap, 0, FALSE);
}
if (VIsual_active)
{
end_visual_mode();
redraw_later(SOME_VALID);
}
}
}
nv_put_opt(cap, TRUE);
}
/*
@@ -9289,6 +9240,16 @@ nv_join(cmdarg_T *cap)
*/
static void
nv_put(cmdarg_T *cap)
{
nv_put_opt(cap, FALSE);
}
/*
* "P", "gP", "p" and "gp" commands.
* "fix_indent" is TRUE for "[p", "[P", "]p" and "]P".
*/
static void
nv_put_opt(cmdarg_T *cap, int fix_indent)
{
int regname = 0;
void *reg1 = NULL, *reg2 = NULL;
@@ -9318,8 +9279,15 @@ nv_put(cmdarg_T *cap)
#endif
else
{
dir = (cap->cmdchar == 'P'
|| (cap->cmdchar == 'g' && cap->nchar == 'P'))
if (fix_indent)
{
dir = (cap->cmdchar == ']' && cap->nchar == 'p')
? FORWARD : BACKWARD;
flags |= PUT_FIXINDENT;
}
else
dir = (cap->cmdchar == 'P'
|| (cap->cmdchar == 'g' && cap->nchar == 'P'))
? BACKWARD : FORWARD;
prep_redo_cmd(cap);
if (cap->cmdchar == 'g')