diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-21 18:20:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 18:20:44 -0500 |
| commit | 185732a1f82098d1f29fb2568eace544c04c0f1f (patch) | |
| tree | a37225da2ec9504926e99d5b8ce8118c5fbcfa2f /src/nvim/normal.c | |
| parent | e192a4600af6db8c54f22c854cbabf0b071ca4bc (diff) | |
| parent | 297567780e575f8c4a15f86087c2c07f14e2c048 (diff) | |
| download | rneovim-185732a1f82098d1f29fb2568eace544c04c0f1f.tar.gz rneovim-185732a1f82098d1f29fb2568eace544c04c0f1f.tar.bz2 rneovim-185732a1f82098d1f29fb2568eace544c04c0f1f.zip | |
Merge pull request #13340 from janlazo/vim-8.2.2025
vim-patch:8.1.1749,8.2.{579,2025,2027,2028,2029}
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index aeada66964..0293bb4a73 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1847,13 +1847,12 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) CancelRedo(); } else { (void)op_delete(oap); - if (oap->motion_type == kMTLineWise && has_format_option(FO_AUTO)) { - // cursor line wasn't saved yet - if (u_save_cursor() == FAIL) { - break; - } + // save cursor line for undo if it wasn't saved yet + if (oap->motion_type == kMTLineWise + && has_format_option(FO_AUTO) + && u_save_cursor() == OK) { + auto_format(false, true); } - auto_format(false, true); } break; |