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

Patch 8.1.2385
Problem:    Opening cmdline window with feedkeys() does not work. (Yegappan
            Lakshmanan)
Solution:   Recognize K_CMDWIN also when ex_normal_busy is set.
Files:	    src/ex_getln.c, src/testdir/test_cmdline.vim


*** ../vim-8.1.2384/src/ex_getln.c	2019-12-01 21:41:24.477837841 +0100
--- src/ex_getln.c	2019-12-04 15:10:39.197949267 +0100
***************
*** 1361,1367 ****
  #ifdef FEAT_CMDWIN
  	if (c == cedit_key || c == K_CMDWIN)
  	{
! 	    if (ex_normal_busy == 0 && got_int == FALSE)
  	    {
  		/*
  		 * Open a window to edit the command line (and history).
--- 1361,1368 ----
  #ifdef FEAT_CMDWIN
  	if (c == cedit_key || c == K_CMDWIN)
  	{
! 	    // TODO: why is ex_normal_busy checked here?
! 	    if ((c == K_CMDWIN || ex_normal_busy == 0) && got_int == FALSE)
  	    {
  		/*
  		 * Open a window to edit the command line (and history).
*** ../vim-8.1.2384/src/testdir/test_cmdline.vim	2019-11-26 16:50:27.300851212 +0100
--- src/testdir/test_cmdline.vim	2019-12-04 15:08:27.754394305 +0100
***************
*** 843,845 ****
--- 843,850 ----
    bwipeout bufb
    bwipeout bufc
  endfunc
+ 
+ func Test_cmdwin_feedkeys()
+   " This should not generate E488
+   call feedkeys("q:\<CR>", 'x')
+ endfunc
*** ../vim-8.1.2384/src/version.c	2019-12-03 22:59:16.810149346 +0100
--- src/version.c	2019-12-04 15:09:31.810178540 +0100
***************
*** 744,745 ****
--- 744,747 ----
  {   /* Add new patch number below this line */
+ /**/
+     2385,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
180. You maintain more than six e-mail addresses.

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