From b1b715d1fb12f935a524dbaf2c2685a8bc0015a3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 21 Jan 2006 22:09:43 +0000
Subject: [PATCH] updated for version 7.0184
---
src/Make_mvc.mak | 2 +-
src/ex_docmd.c | 5 ++++-
src/fileio.c | 6 ++++++
src/gui_w16.c | 16 ++++++++++++++++
src/gui_w48.c | 17 -----------------
src/window.c | 9 +++++++++
6 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index ad46c19fb0..f373806ec8 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -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
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 4e430c7bc6..798262d196 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -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;
diff --git a/src/fileio.c b/src/fileio.c
index ce3e2a043d..868b649891 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -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);
}
diff --git a/src/gui_w16.c b/src/gui_w16.c
index 2452ce360b..b8e8ca9495 100644
--- a/src/gui_w16.c
+++ b/src/gui_w16.c
@@ -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)
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 03b7d71750..3aa028ee4b 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -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)
{
diff --git a/src/window.c b/src/window.c
index a021805941..bb2647cff4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -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 */
--
GitLab