To: vim_dev@googlegroups.com
Subject: Patch 8.2.1807
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.2.1807
Problem:    Can use :help in a terminal popup window.
Solution:   Give an error. (closes #7088)
Files:      src/help.c, src/testdir/test_popupwin.vim


*** ../vim-8.2.1806/src/help.c	2020-07-21 21:07:00.720496743 +0200
--- src/help.c	2020-10-06 20:45:44.996025202 +0200
***************
*** 39,44 ****
--- 39,47 ----
      int		old_KeyTyped = KeyTyped;
  #endif
  
+     if (ERROR_IF_ANY_POPUP_WINDOW)
+ 	return;
+ 
      if (eap != NULL)
      {
  	// A ":help" command ends at the first LF, or at a '|' that is
*** ../vim-8.2.1806/src/testdir/test_popupwin.vim	2020-09-28 22:29:25.425766287 +0200
--- src/testdir/test_popupwin.vim	2020-10-06 20:44:44.376183452 +0200
***************
*** 2645,2650 ****
--- 2645,2654 ----
    let g:test_is_flaky = 1
  
    let origwin = win_getid()
+ 
+   " open help window to test that :help below fails
+   help
+ 
    let termbuf = term_start(&shell, #{hidden: 1})
    let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10})
    " Wait for shell to start
***************
*** 2666,2671 ****
--- 2670,2676 ----
  
    " Cannot escape from terminal window
    call assert_fails('tab drop xxx', 'E863:')
+   call assert_fails('help', 'E994:')
  
    " Cannot open a second one.
    let termbuf2 = term_start(&shell, #{hidden: 1})
***************
*** 2677,2682 ****
--- 2682,2688 ----
    " Wait for shell to exit
    call WaitForAssert({-> assert_equal("dead", job_status(term_getjob(termbuf)))})
  
+   helpclose
    call feedkeys(":quit\<CR>", 'xt')
    call assert_equal(origwin, win_getid())
  endfunc
*** ../vim-8.2.1806/src/version.c	2020-10-06 19:59:03.470903612 +0200
--- src/version.c	2020-10-06 20:42:41.108504263 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     1807,
  /**/

-- 
Latest survey shows that 3 out of 4 people make up 75% of the
world's population.

 /// 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    ///