thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0184

Browse Source
This commit is contained in:
Bram Moolenaar
2006-01-21 22:12:51 +00:00
parent b1b715d1fb
commit c716c306e9
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui_w32.c
View File

@@ -2166,6 +2166,29 @@ clear_rect(RECT *rcp)
}
void
gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
{
RECT workarea_rect;
get_work_area(&workarea_rect);
*screen_w = workarea_rect.right
- GetSystemMetrics(SM_CXFRAME) * 2;
/* FIXME: dirty trick: Because the gui_get_base_height() doesn't include
* the menubar for MSwin, we subtract it from the screen height, so that
* the window size can be made to fit on the screen. */
*screen_h = workarea_rect.bottom
- GetSystemMetrics(SM_CYFRAME) * 2
- GetSystemMetrics(SM_CYCAPTION)
#ifdef FEAT_MENU
- gui_mswin_get_menu_height(FALSE)
#endif
;
}
#if defined(FEAT_MENU) || defined(PROTO)
/*
* Add a sub menu to the menu bar.
@@ -2779,7 +2802,7 @@ gui_mch_dialog(
{
RECT workarea_rect;
/* We don't have a window, use the desktip area. */
/* We don't have a window, use the desktop area. */
get_work_area(&workarea_rect);
maxDialogWidth = workarea_rect.right - workarea_rect.left - 100;
if (maxDialogWidth > 600)

4
src/if_cscope.c
View File

@@ -44,7 +44,9 @@ static int cs_cnt_matches __ARGS((int idx));
static char * cs_create_cmd __ARGS((char *csoption, char *pattern));
static int cs_create_connection __ARGS((int i));
static void do_cscope_general __ARGS((exarg_T *eap, int make_split));
#ifdef FEAT_QUICKFIX
static void cs_file_results __ARGS((FILE *, int *));
#endif
static void cs_fill_results __ARGS((char *, int , int *, char ***,
char ***, int *));
static int cs_find __ARGS((exarg_T *eap));
@@ -1670,6 +1672,7 @@ cs_parse_results(cnumber, buf, bufsize, context, linenumber, search)
return name;
}
#ifdef FEAT_QUICKFIX
/*
* PRIVATE: cs_file_results
*
@@ -1725,6 +1728,7 @@ cs_file_results(f, nummatches_a)
} /* for all cscope connections */
vim_free(buf);
}
#endif
/*
* PRIVATE: cs_fill_results

2
src/testdir/test10.in
View File

@@ -1,4 +1,4 @@
Test for 'errorformat'.
Test for 'errorformat'. This will fail if the quickfix feature was disabled.
STARTTEST
:so small.vim

4
src/version.h
View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 20)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 20, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 21)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Jan 21, compiled "