updated for version 7.0184

6 files changed, 36 insertions, 19 deletions

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index ad46c19f..f373806e 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 4e430c7b..798262d1 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 ce3e2a04..868b6498 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 2452ce36..b8e8ca94 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 03b7d717..3aa028ee 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2478,23 +2478,6 @@ gui_mswin_get_valid_dimensions(
 }
 
     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)
 {
     RECT    rc;
diff --git a/src/window.c b/src/window.c
index a0218059..bb2647cf 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
@@ -162,6 +168,9 @@ do_window(nchar, Prenum, xchar)
 #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 */
 		else