To: vim_dev@googlegroups.com
Subject: Patch 9.0.1588
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.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)
Files:      src/ex_getln.c, src/testdir/test_hlsearch.vim


*** ../vim-9.0.1587/src/ex_getln.c	2023-05-20 14:06:56.673542805 +0100
--- src/ex_getln.c	2023-05-29 16:06:59.058972674 +0100
***************
*** 1221,1227 ****
  #endif
      if (c != ESC)	    // use ESC to cancel inserting register
      {
! 	literally = i == Ctrl_R;
  	cmdline_paste(c, literally, FALSE);
  
  #ifdef FEAT_EVAL
--- 1221,1232 ----
  #endif
      if (c != ESC)	    // use ESC to cancel inserting register
      {
! 	literally = i == Ctrl_R
! #ifdef FEAT_CLIPBOARD
! 			|| (clip_star.available && c == '*')
! 			|| (clip_plus.available && c == '+')
! #endif
! 			;
  	cmdline_paste(c, literally, FALSE);
  
  #ifdef FEAT_EVAL
*** ../vim-9.0.1587/src/testdir/test_hlsearch.vim	2023-02-10 21:38:26.113444491 +0000
--- src/testdir/test_hlsearch.vim	2023-05-29 16:04:28.727034642 +0100
***************
*** 91,94 ****
--- 91,113 ----
    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
*** ../vim-9.0.1587/src/version.c	2023-05-28 22:11:17.800701909 +0100
--- src/version.c	2023-05-29 16:07:36.398958283 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1588,
  /**/

-- 
Where do you want to crash today?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///