commit 796139ae3ac89e27ee96dce3c7fdb87d8c839f53
author Bram Moolenaar <Bram@vim.org> Tue May 18 21:38:45 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Tue May 18 21:38:45 2021 +0200
tree 40044765188bc84813b2e4b37e0d4a51ff3681de
parent 485b62710004431a16feb4eb861365d082304a08

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)

src/ex_getln.c

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4ebc341..e7d71a5 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1253,8 +1253,11 @@
 	}
 #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;
 }
 
 /*

src/testdir/test_cmdline.vim

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 5ed283f..bba7e72 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1810,6 +1810,12 @@
   call feedkeys(":\<F1>\<CR>", 'xt')
   call assert_equal(['l', 'ls'], g:log)
 
+  let @b = 'b'
+  cnoremap <F1> a<C-R>b
+  let g:log = []
+  call feedkeys(":\<F1>\<CR>", 'xt')
+  call assert_equal(['a', 'ab'], g:log)
+
   unlet g:log
   cunmap <F1>
   augroup test

src/version.c

diff --git a/src/version.c b/src/version.c
index 0b17d91..edc95e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2870,
+/**/
     2869,
 /**/
     2868,