mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 06:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.487

Browse Source 
Problem:    ":sign jump" may use another window even though the file is
	    already edited in the current window.
Solution:   First check if the file is in the current window. (James McCoy)

https://code.google.com/p/vim/source/detail?r=v7-4-487
This commit is contained in:
Justin M. Keyes
2014-12-29 00:17:46 -05:00
parent ec615012a7
commit bb1be08bae
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/version.c
View File

@@ -251,7 +251,7 @@ static int included_patches[] = {
//490, //490,
489, 489,
488, 488,
//487, 487,
486, 486,
485, 485,
//484 NA //484 NA

27
src/nvim/window.c
View File

@@ -3543,27 +3543,28 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int tri
} }
/* /// Jump to the first open window that contains buffer "buf", if one exists.
* Jump to the first open window that contains buffer "buf", if one exists. /// Returns a pointer to the window found, otherwise NULL.
* Returns a pointer to the window found, otherwise NULL.
*/
win_T *buf_jump_open_win(buf_T *buf) win_T *buf_jump_open_win(buf_T *buf)
{ {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { if (curwin->w_buffer == buf) {
if (wp->w_buffer == buf) { win_enter(curwin, false);
win_enter(wp, false); return curwin;
return wp; } else {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == buf) {
win_enter(wp, false);
return wp;
}
} }
} }
return NULL; return NULL;
} }
/* /// Jump to the first open window in any tab page that contains buffer "buf",
* Jump to the first open window in any tab page that contains buffer "buf", /// if one exists.
* if one exists. /// @return the found window, or NULL.
* Returns a pointer to the window found, otherwise NULL.
*/
win_T *buf_jump_open_tab(buf_T *buf) win_T *buf_jump_open_tab(buf_T *buf)
{ {