aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 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)
This commit is contained in:
Bram Moolenaar
2014-10-21 20:57:15 +02:00
parent 958636c406
commit 482a2b5c9d
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/Make_amiga.mak
View File

@@ -46,6 +46,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
.SUFFIXES: .in .out
@@ -179,4 +180,5 @@ test_listlbr.out: test_listlbr.in
test_listlbr_utf8.out: test_listlbr_utf8.in
test_options.out: test_options.in
test_qf_title.out: test_qf_title.in
test_signs.out: test_signs.in
test_utf8.out: test_utf8.in

1
src/testdir/Make_dos.mak
View File

@@ -45,6 +45,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
SCRIPTS32 = test50.out test70.out

1
src/testdir/Make_ming.mak
View File

@@ -65,6 +65,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
SCRIPTS32 = test50.out test70.out

1
src/testdir/Make_os2.mak
View File

@@ -47,6 +47,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
.SUFFIXES: .in .out

1
src/testdir/Make_vms.mms
View File

@@ -106,6 +106,7 @@ SCRIPT = test1.out test2.out test3.out test4.out test5.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
# Known problems:

1
src/testdir/Makefile
View File

@@ -43,6 +43,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
test_mapping.out \
test_options.out \
test_qf_title.out \
test_signs.out \
test_utf8.out
SCRIPTS_GUI = test16.out

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
487,
/**/
486,
/**/

24
src/window.c
View File

@@ -4407,20 +4407,19 @@ win_enter_ext(wp, undo_sync, curwin_invalid, trigger_enter_autocmds, trigger_lea
buf_jump_open_win(buf)
buf_T *buf;
{
# ifdef FEAT_WINDOWS
win_T *wp;
win_T *wp = NULL;
if (curwin->w_buffer == buf)
wp = curwin;
# ifdef FEAT_WINDOWS
else
for (wp = firstwin; wp != NULL; wp = wp->w_next)
if (wp->w_buffer == buf)
break;
if (wp != NULL)
win_enter(wp, FALSE);
return wp;
# else
if (curwin->w_buffer == buf)
return curwin;
return NULL;
# endif
return wp;
}
/*
@@ -4432,12 +4431,10 @@ buf_jump_open_win(buf)
buf_jump_open_tab(buf)
buf_T *buf;
{
win_T *wp = buf_jump_open_win(buf);
# ifdef FEAT_WINDOWS
win_T *wp;
tabpage_T *tp;
/* First try the current tab page. */
wp = buf_jump_open_win(buf);
if (wp != NULL)
return wp;
@@ -4455,13 +4452,8 @@ buf_jump_open_tab(buf)
break;
}
}
return wp;
# else
if (curwin->w_buffer == buf)
return curwin;
return NULL;
# endif
return wp;
}
#endif