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

patch 8.1.0686: when 'y' is in 'cpoptions' yanking for the clipboard changes redo

Browse Source 
Problem:    When 'y' is in 'cpoptions' yanking for the clipboard changes redo.
Solution:   Do not use the 'y' flag when "gui_yank" is TRUE. (Andy Massimino,
            closes #3760)
This commit is contained in:
Bram Moolenaar
2019-01-03 22:58:08 +01:00
parent f2d79fa92d
commit 5823f84dd0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/normal.c
View File

@@ -1326,7 +1326,8 @@ set_vcount_ca(cmdarg_T *cap, int *set_prevcount)
#endif #endif
/* /*
* Handle an operator after visual mode or when the movement is finished * Handle an operator after Visual mode or when the movement is finished.
* "gui_yank" is true when yanking text for the clipboard.
*/ */
void void
do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
@@ -1372,6 +1373,10 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
*/ */
if ((finish_op || VIsual_active) && oap->op_type != OP_NOP) if ((finish_op || VIsual_active) && oap->op_type != OP_NOP)
{ {
// Yank can be redone when 'y' is in 'cpoptions', but not when yanking
// for the clipboard.
int redo_yank = vim_strchr(p_cpo, CPO_YANK) != NULL && !gui_yank;
#ifdef FEAT_LINEBREAK #ifdef FEAT_LINEBREAK
/* Avoid a problem with unwanted linebreaks in block mode. */ /* Avoid a problem with unwanted linebreaks in block mode. */
if (curwin->w_p_lbr) if (curwin->w_p_lbr)
@@ -1407,7 +1412,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
/* Only redo yank when 'y' flag is in 'cpoptions'. */ /* Only redo yank when 'y' flag is in 'cpoptions'. */
/* Never redo "zf" (define fold). */ /* Never redo "zf" (define fold). */
if ((vim_strchr(p_cpo, CPO_YANK) != NULL || oap->op_type != OP_YANK) if ((redo_yank || oap->op_type != OP_YANK)
&& ((!VIsual_active || oap->motion_force) && ((!VIsual_active || oap->motion_force)
/* Also redo Operator-pending Visual mode mappings */ /* Also redo Operator-pending Visual mode mappings */
|| (VIsual_active && cap->cmdchar == ':' || (VIsual_active && cap->cmdchar == ':'
@@ -1628,7 +1633,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
} }
/* can't redo yank (unless 'y' is in 'cpoptions') and ":" */ /* can't redo yank (unless 'y' is in 'cpoptions') and ":" */
if ((vim_strchr(p_cpo, CPO_YANK) != NULL || oap->op_type != OP_YANK) if ((redo_yank || oap->op_type != OP_YANK)
&& oap->op_type != OP_COLON && oap->op_type != OP_COLON
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
&& oap->op_type != OP_FOLD && oap->op_type != OP_FOLD

2
src/version.c
View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
686,
/**/ /**/
685, 685,
/**/ /**/