# HG changeset patch # User Bram Moolenaar # Date 1621367103 -7200 # Node ID ce7a80bd0fd53ba97b25c2d44b8c820151c41893 # Parent e7e7b4f11187ae2baf0a8a4d66a94ff1465770da patch 8.2.2870: CmdlineChange event triggered twice for CTRL-R Commit: https://github.com/vim/vim/commit/796139ae3ac89e27ee96dce3c7fdb87d8c839f53 Author: Bram Moolenaar Date: Tue May 18 21:38:45 2021 +0200 patch 8.2.2870: CmdlineChange event triggered twice for CTRL-R Problem: CmdlineChange event triggered twice for CTRL-R. Solution: Return CMDLINE_NOT_CHANGED from cmdline_insert_reg(). (closes #8219) diff --git a/src/ex_getln.c b/src/ex_getln.c --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1253,8 +1253,11 @@ cmdline_insert_reg(int *gotesc UNUSED) } #endif } + // remove the double quote redrawcmd(); - return CMDLINE_CHANGED; + + // The text has been stuffed, the command line didn't change yet. + return CMDLINE_NOT_CHANGED; } /* diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1810,6 +1810,12 @@ func Test_cmd_map_cmdlineChanged() call feedkeys(":\\", 'xt') call assert_equal(['l', 'ls'], g:log) + let @b = 'b' + cnoremap ab + let g:log = [] + call feedkeys(":\\", 'xt') + call assert_equal(['a', 'ab'], g:log) + unlet g:log cunmap augroup test diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2870, +/**/ 2869, /**/ 2868,