1
0
forked from aniani/vim

patch 9.0.1588: Incsearch not triggered when pasting clipboard register

Problem:    Incsearch not triggered when pasting clipboard register on the
            command line.
Solution:   Also set "literally" when using a clipboard register. (Ken Takata,
            closes #12460)
This commit is contained in:
K.Takata
2023-05-29 16:08:08 +01:00
committed by Bram Moolenaar
parent 05843e8960
commit 9cf6ab1332
3 changed files with 27 additions and 1 deletions

View File

@@ -1221,7 +1221,12 @@ cmdline_insert_reg(int *gotesc UNUSED)
#endif #endif
if (c != ESC) // use ESC to cancel inserting register if (c != ESC) // use ESC to cancel inserting register
{ {
literally = i == Ctrl_R; literally = i == Ctrl_R
#ifdef FEAT_CLIPBOARD
|| (clip_star.available && c == '*')
|| (clip_plus.available && c == '+')
#endif
;
cmdline_paste(c, literally, FALSE); cmdline_paste(c, literally, FALSE);
#ifdef FEAT_EVAL #ifdef FEAT_EVAL

View File

@@ -91,4 +91,23 @@ func Test_hlsearch_Ctrl_R()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_hlsearch_clipboard()
CheckRunVimInTerminal
CheckFeature clipboard_working
let lines =<< trim END
set incsearch hlsearch
let @* = "text"
put *
END
call writefile(lines, 'XhlsearchClipboard', 'D')
let buf = RunVimInTerminal('-S XhlsearchClipboard', #{rows: 6, cols: 60})
call term_sendkeys(buf, "/\<C-R>*")
call VerifyScreenDump(buf, 'Test_hlsearch_ctrlr_1', {})
call term_sendkeys(buf, "\<Esc>")
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1588,
/**/ /**/
1587, 1587,
/**/ /**/