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

updated for version 7.0184

Browse Source
This commit is contained in:
Bram Moolenaar 2006-01-21 22:09:43 +00:00
parent b71eaaeaa8
commit b1b715d1fb
6 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Make_mvc.mak
View File

@ -736,7 +736,7 @@ notags:
clean:
- if exist $(OUTDIR)/nul $(DEL_TREE) $(OUTDIR)
- if exist auto/nul $(DEL_TREE) auto
- if exist auto/pathdef.c del auto/pathdef.c
- if exist *.obj del *.obj
- if exist $(VIM).exe del $(VIM).exe
- if exist $(VIM).ilk del $(VIM).ilk

5
src/ex_docmd.c
View File

@ -9729,7 +9729,10 @@ put_view(fd, wp, add_edit, flagp)
*/
if ((*flagp & SSOP_FOLDS)
&& wp->w_buffer->b_ffname != NULL
&& (*wp->w_buffer->b_p_bt == NUL || wp->w_buffer->b_help))
# ifdef FEAT_QUICKFIX
&& (*wp->w_buffer->b_p_bt == NUL || wp->w_buffer->b_help)
# endif
)
{
if (put_folds(fd, wp) == FAIL)
return FAIL;

6
src/fileio.c
View File

@ -2882,9 +2882,11 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD,
sfname, sfname, FALSE, curbuf, eap)))
{
#ifdef FEAT_QUICKFIX
if (overwriting && bt_nofile(curbuf))
nofile_err = TRUE;
else
#endif
apply_autocmds_exarg(EVENT_FILEAPPENDPRE,
sfname, sfname, FALSE, curbuf, eap);
}
@ -2899,9 +2901,11 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
sfname, sfname, FALSE, curbuf, eap)))
{
#ifdef FEAT_QUICKFIX
if (overwriting && bt_nofile(curbuf))
nofile_err = TRUE;
else
#endif
apply_autocmds_exarg(EVENT_BUFWRITEPRE,
sfname, sfname, FALSE, curbuf, eap);
}
@ -2911,9 +2915,11 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
sfname, sfname, FALSE, curbuf, eap)))
{
#ifdef FEAT_QUICKFIX
if (overwriting && bt_nofile(curbuf))
nofile_err = TRUE;
else
#endif
apply_autocmds_exarg(EVENT_FILEWRITEPRE,
sfname, sfname, FALSE, curbuf, eap);
}

16
src/gui_w16.c
View File

@ -764,6 +764,22 @@ clear_rect(RECT *rcp)
}
void
gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
{
*screen_w = GetSystemMetrics(SM_CXFULLSCREEN)
- 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 = GetSystemMetrics(SM_CYFULLSCREEN)
- GetSystemMetrics(SM_CYFRAME) * 2
#ifdef FEAT_MENU
- gui_mswin_get_menu_height(FALSE)
#endif
;
}
#if defined(FEAT_MENU) || defined(PROTO)

17
src/gui_w48.c
View File

@ -2477,23 +2477,6 @@ gui_mswin_get_valid_dimensions(
((h - base_height) / gui.char_height) * gui.char_height;
}
void
gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
{
*screen_w = GetSystemMetrics(SM_CXFULLSCREEN)
- 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 = GetSystemMetrics(SM_CYFULLSCREEN)
- GetSystemMetrics(SM_CYFRAME) * 2
#ifdef FEAT_MENU
- gui_mswin_get_menu_height(FALSE)
#endif
;
}
void
gui_mch_flash(int msec)
{

9
src/window.c
View File

@ -121,6 +121,12 @@ do_window(nchar, Prenum, xchar)
#ifdef FEAT_VISUAL
reset_VIsual_and_resel(); /* stop Visual mode */
#endif
#ifdef FEAT_QUICKFIX
/* When splitting the quickfix window open a new buffer in it,
* don't replicate the quickfix buffer. */
if (bt_quickfix(curbuf))
goto newwindow;
#endif
#ifdef FEAT_GUI
need_mouse_correct = TRUE;
#endif
@ -161,6 +167,9 @@ do_window(nchar, Prenum, xchar)
CHECK_CMDWIN
#ifdef FEAT_VISUAL
reset_VIsual_and_resel(); /* stop Visual mode */
#endif
#ifdef FEAT_QUICKFIX
newwindow:
#endif
if (Prenum)
sprintf((char *)cbuf, "%ld", Prenum); /* window height */