diff options
| author | K.Takata <kentkt@csc.jp> | 2023-05-29 16:08:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-29 16:08:08 +0100 |
| commit | 9cf6ab133227ac7e9169941752293bb7178d8e38 (patch) | |
| tree | 4ea6769eddb5795364ce81e1fbf26da334e18a9c | |
| parent | 05843e89601c03389a2d7978e7e16aec641a3dc4 (diff) | |
patch 9.0.1588: Incsearch not triggered when pasting clipboard registerv9.0.1588
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)
| -rw-r--r-- | src/ex_getln.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_hlsearch.vim | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index fbda2cc00d..00d32920b6 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1221,7 +1221,12 @@ cmdline_insert_reg(int *gotesc UNUSED) #endif 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); #ifdef FEAT_EVAL diff --git a/src/testdir/test_hlsearch.vim b/src/testdir/test_hlsearch.vim index 476c075a5d..eb8fb873b7 100644 --- a/src/testdir/test_hlsearch.vim +++ b/src/testdir/test_hlsearch.vim @@ -91,4 +91,23 @@ func Test_hlsearch_Ctrl_R() call StopVimInTerminal(buf) 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 diff --git a/src/version.c b/src/version.c index 08c67bb7c6..34c845669c 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1588, +/**/ 1587, /**/ 1586, |