0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0-146

This commit is contained in:
Bram Moolenaar
2006-10-20 18:13:14 +00:00
parent 2d8b2d8df9
commit 38c0a6e6fa
3 changed files with 30 additions and 8 deletions

View File

@@ -1208,11 +1208,11 @@ do_buffer(action, start, dir, count, forceit)
{
# ifdef FEAT_WINDOWS
/* jump to first window containing buf if one exists ("useopen") */
if (vim_strchr(p_swb, 'o') && buf_jump_open_win(buf))
if (vim_strchr(p_swb, 'o') != NULL && buf_jump_open_win(buf))
return OK;
/* jump to first window in any tab page containing buf if one exists
* ("usetab") */
if (vim_strchr(p_swb, 'a') && buf_jump_open_tab(buf))
if (vim_strchr(p_swb, 'a') != NULL && buf_jump_open_tab(buf))
return OK;
if (win_split(0, 0) == FAIL)
# endif
@@ -1842,13 +1842,13 @@ buflist_getfile(n, lnum, options, forceit)
if (options & GETF_SWITCH)
{
/* use existing open window for buffer if wanted */
if (vim_strchr(p_swb, 'o')) /* useopen */
if (vim_strchr(p_swb, 'o') != NULL) /* useopen */
wp = buf_jump_open_win(buf);
/* use existing open window in any tab page for buffer if wanted */
if (vim_strchr(p_swb, 'a')) /* usetab */
if (vim_strchr(p_swb, 'a') != NULL) /* usetab */
wp = buf_jump_open_tab(buf);
/* split window if wanted ("split") */
if (wp == NULL && vim_strchr(p_swb, 't') && !bufempty())
if (wp == NULL && vim_strchr(p_swb, 'l') != NULL && !bufempty())
{
if (win_split(0, 0) == FAIL)
return FAIL;