patch 9.0.1866: undo is synced after character find
Problem: Undo is synced after character find.
Solution: Set no_u_sync when calling gotchars_nop().
closes: #13022
closes: #13024
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/normal.c b/src/normal.c
index b73afd3..86b8740 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -570,7 +570,9 @@
// but when replaying a recording the next key is already in the
// typeahead buffer, so record a <Nop> before that to prevent the
// vpeekc() above from applying wrong mappings when replaying.
+ ++no_u_sync;
gotchars_nop();
+ --no_u_sync;
}
}
--no_mapping;
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index 368ebbe..58563bd 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -862,5 +862,15 @@
call delete('Xtestfile.txt')
endfunc
+func Test_undo_range_normal()
+ new
+ call setline(1, ['asa', 'bsb'])
+ let &l:undolevels = &l:undolevels
+ %normal dfs
+ call assert_equal(['a', 'b'], getline(1, '$'))
+ undo
+ call assert_equal(['asa', 'bsb'], getline(1, '$'))
+ bwipe!
+endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index c4b793f..5eb9c59 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1866,
+/**/
1865,
/**/
1864,