fed8ce6
To: vim-dev@vim.org
fed8ce6
Subject: Patch 7.2.117
fed8ce6
Fcc: outbox
fed8ce6
From: Bram Moolenaar <Bram@moolenaar.net>
fed8ce6
Mime-Version: 1.0
fed8ce6
Content-Type: text/plain; charset=ISO-8859-1
fed8ce6
Content-Transfer-Encoding: 8bit
fed8ce6
------------
fed8ce6
fed8ce6
Patch 7.2.117
fed8ce6
Problem:    Location list incorrectly labelled "Quickfix List".
fed8ce6
Solution:   Break out of both loops for finding window for location list
fed8ce6
            buffer. (Lech Lorens)
fed8ce6
Files:      src/buffer.c, src/quickfix.c, src/screen.c
fed8ce6
fed8ce6
fed8ce6
*** ../vim-7.2.116/src/buffer.c	Tue Jan  6 16:13:42 2009
fed8ce6
--- src/buffer.c	Tue Feb 17 04:00:51 2009
fed8ce6
***************
fed8ce6
*** 5098,5104 ****
fed8ce6
  	 */
fed8ce6
  	FOR_ALL_TAB_WINDOWS(tp, win)
fed8ce6
  	    if (win->w_buffer == buf)
fed8ce6
! 		break;
fed8ce6
  	if (win != NULL && win->w_llist_ref != NULL)
fed8ce6
  	    return _("[Location List]");
fed8ce6
  	else
fed8ce6
--- 5098,5105 ----
fed8ce6
  	 */
fed8ce6
  	FOR_ALL_TAB_WINDOWS(tp, win)
fed8ce6
  	    if (win->w_buffer == buf)
fed8ce6
! 		goto win_found;
fed8ce6
! win_found:
fed8ce6
  	if (win != NULL && win->w_llist_ref != NULL)
fed8ce6
  	    return _("[Location List]");
fed8ce6
  	else
fed8ce6
*** ../vim-7.2.116/src/quickfix.c	Sat Nov 15 14:10:23 2008
fed8ce6
--- src/quickfix.c	Sat Feb 21 22:54:25 2009
fed8ce6
***************
fed8ce6
*** 1610,1619 ****
fed8ce6
  		{
fed8ce6
  		    goto_tabpage_win(tp, wp);
fed8ce6
  		    usable_win = 1;
fed8ce6
! 		    break;
fed8ce6
  		}
fed8ce6
  	    }
fed8ce6
  	}
fed8ce6
  
fed8ce6
  	/*
fed8ce6
  	 * If there is only one window and it is the quickfix window, create a
fed8ce6
--- 1612,1622 ----
fed8ce6
  		{
fed8ce6
  		    goto_tabpage_win(tp, wp);
fed8ce6
  		    usable_win = 1;
fed8ce6
! 		    goto win_found;
fed8ce6
  		}
fed8ce6
  	    }
fed8ce6
  	}
fed8ce6
+ win_found:
fed8ce6
  
fed8ce6
  	/*
fed8ce6
  	 * If there is only one window and it is the quickfix window, create a
fed8ce6
*** ../vim-7.2.116/src/screen.c	Sat Feb 21 21:22:44 2009
fed8ce6
--- src/screen.c	Sat Feb 21 21:04:19 2009
fed8ce6
***************
fed8ce6
*** 7452,7461 ****
fed8ce6
  	{
fed8ce6
  	    outofmem = TRUE;
fed8ce6
  #ifdef FEAT_WINDOWS
fed8ce6
! 	    break;
fed8ce6
  #endif
fed8ce6
  	}
fed8ce6
      }
fed8ce6
  
fed8ce6
  #ifdef FEAT_MBYTE
fed8ce6
      for (i = 0; i < p_mco; ++i)
fed8ce6
--- 7452,7464 ----
fed8ce6
  	{
fed8ce6
  	    outofmem = TRUE;
fed8ce6
  #ifdef FEAT_WINDOWS
fed8ce6
! 	    goto give_up;
fed8ce6
  #endif
fed8ce6
  	}
fed8ce6
      }
fed8ce6
+ #ifdef FEAT_WINDOWS
fed8ce6
+ give_up:
fed8ce6
+ #endif
fed8ce6
  
fed8ce6
  #ifdef FEAT_MBYTE
fed8ce6
      for (i = 0; i < p_mco; ++i)
fed8ce6
*** ../vim-7.2.116/src/version.c	Sat Feb 21 22:57:10 2009
fed8ce6
--- src/version.c	Sat Feb 21 23:58:24 2009
fed8ce6
***************
fed8ce6
*** 678,679 ****
fed8ce6
--- 678,681 ----
fed8ce6
  {   /* Add new patch number below this line */
fed8ce6
+ /**/
fed8ce6
+     117,
fed8ce6
  /**/
fed8ce6
fed8ce6
-- 
fed8ce6
Laughing helps. It's like jogging on the inside.
fed8ce6
fed8ce6
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
fed8ce6
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
fed8ce6
\\\        download, build and distribute -- http://www.A-A-P.org        ///
fed8ce6
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///