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

updated for version 7.0225

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-15 23:06:44 +00:00
parent 95e9b49537
commit 27dc19509b
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.c
View File

@@ -416,13 +416,8 @@ main
TIME_MSG("expanding arguments");
#ifdef FEAT_DIFF
if (params.diff_mode)
{
if (params.window_count == -1)
params.window_count = 0; /* open up to 3 windows */
if (params.window_layout == 0)
params.window_layout = WIN_VER; /* use vertical split */
}
if (params.diff_mode && params.window_count == -1)
params.window_count = 0; /* open up to 3 windows */
#endif
/* Don't redraw until much later. */
@@ -556,6 +551,17 @@ main
}
#endif
#ifdef FEAT_DIFF
/* Decide about window layout for diff mode after reading vimrc. */
if (params.diff_mode && params.window_layout == 0)
{
if (diffopt_horizontal())
params.window_layout = WIN_HOR; /* use horizontal split */
else
params.window_layout = WIN_VER; /* use vertical split */
}
#endif
/*
* Recovery mode without a file name: List swap files.
* This uses the 'dir' option, therefore it must be after the
@@ -1357,7 +1363,7 @@ parse_command_name(parmp)
disallow_gui = TRUE;
/* TODO: On MacOS X default to gui if argv[0] ends in:
* /vim.app/Contents/MacOS/Vim */
* /Vim.app/Contents/MacOS/Vim */
#endif
#ifdef FEAT_EVAL