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

Patch 7.4.2248
Problem:    When cancelling the :ptjump prompt a preview window is opened for
            a following command.
Solution:   Reset g_do_tagpreview. (Hirohito Higashi)  Add a test.  Avoid that
            the test runner gets stuck in trying to close a window.
Files:      src/tag.c, src/testdir/test_tagjump.vim, src/testdir/runtest.vim


*** ../vim-7.4.2247/src/tag.c	2016-08-20 16:56:48.250624340 +0200
--- src/tag.c	2016-08-24 21:09:24.083040384 +0200
***************
*** 1078,1083 ****
--- 1078,1086 ----
  	curwin->w_tagstackidx = tagstackidx;
  #ifdef FEAT_WINDOWS
      postponed_split = 0;	/* don't split next time */
+ # ifdef FEAT_QUICKFIX
+     g_do_tagpreview = 0;	/* don't do tag preview next time */
+ # endif
  #endif
  
  #ifdef FEAT_CSCOPE
*** ../vim-7.4.2247/src/testdir/test_tagjump.vim	2016-08-18 23:04:44.662592810 +0200
--- src/testdir/test_tagjump.vim	2016-08-24 20:57:24.142857315 +0200
***************
*** 7,10 ****
--- 7,26 ----
    set tagstack&vim
  endfunc
  
+ func Test_cancel_ptjump()
+   set tags=Xtags
+   call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//",
+         \ "word\tfile1\tcmd1",
+         \ "word\tfile2\tcmd2"],
+         \ 'Xtags')
+ 
+   only!
+   call feedkeys(":ptjump word\<CR>\<CR>", "xt")
+   help
+   call assert_equal(2, winnr('$'))
+ 
+   call delete('Xtags')
+   quit
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2247/src/testdir/runtest.vim	2016-08-04 21:11:28.623170452 +0200
--- src/testdir/runtest.vim	2016-08-24 21:05:55.838124787 +0200
***************
*** 105,112 ****
    endif
  
    " Close any extra windows and make the current one not modified.
!   while winnr('$') > 1
      bwipe!
    endwhile
    set nomodified
  endfunc
--- 105,121 ----
    endif
  
    " Close any extra windows and make the current one not modified.
!   while 1
!     let wincount = winnr('$')
!     if wincount == 1
!       break
!     endif
      bwipe!
+     if wincount == winnr('$')
+       " Did not manage to close a window.
+       only!
+       break
+     endif
    endwhile
    set nomodified
  endfunc
*** ../vim-7.4.2247/src/version.c	2016-08-24 00:39:01.421663470 +0200
--- src/version.c	2016-08-24 21:07:25.168840382 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2248,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
62. If your doorbell rings, you think that new mail has arrived.  And then
    you're disappointed that it's only someone at the door.

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