0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.3.429

Problem:    When 'cpoptions' includes "E" "c0" in the first column is an
            error. The redo register is then set to the errornous command.
Solution:   Do not set the redo register if the command fails because of an
            empty region. (Hideki Eiraku)
This commit is contained in:
Bram Moolenaar
2012-02-05 01:18:48 +01:00
parent e37c611012
commit be094a1579
4 changed files with 43 additions and 4 deletions

View File

@@ -1978,7 +1978,10 @@ do_pending_operator(cap, old_col, gui_yank)
VIsual_reselect = FALSE; /* don't reselect now */
#endif
if (empty_region_error)
{
vim_beep();
CancelRedo();
}
else
{
(void)op_delete(oap);
@@ -1992,7 +1995,10 @@ do_pending_operator(cap, old_col, gui_yank)
if (empty_region_error)
{
if (!gui_yank)
{
vim_beep();
CancelRedo();
}
}
else
(void)op_yank(oap, FALSE, !gui_yank);
@@ -2004,7 +2010,10 @@ do_pending_operator(cap, old_col, gui_yank)
VIsual_reselect = FALSE; /* don't reselect now */
#endif
if (empty_region_error)
{
vim_beep();
CancelRedo();
}
else
{
/* This is a new edit command, not a restart. Need to
@@ -2066,7 +2075,10 @@ do_pending_operator(cap, old_col, gui_yank)
case OP_LOWER:
case OP_ROT13:
if (empty_region_error)
{
vim_beep();
CancelRedo();
}
else
op_tilde(oap);
check_cursor_col();
@@ -2099,7 +2111,10 @@ do_pending_operator(cap, old_col, gui_yank)
#endif
#ifdef FEAT_VISUALEXTRA
if (empty_region_error)
{
vim_beep();
CancelRedo();
}
else
{
/* This is a new edit command, not a restart. Need to
@@ -2129,7 +2144,10 @@ do_pending_operator(cap, old_col, gui_yank)
#ifdef FEAT_VISUALEXTRA
if (empty_region_error)
#endif
{
vim_beep();
CancelRedo();
}
#ifdef FEAT_VISUALEXTRA
else
op_replace(oap, cap->nchar);