From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 20 Mar 2016 16:28:35 +0000 (+0100)
Subject: patch 7.4.1618
X-Git-Tag: v7.4.1618
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4f6ca717b4483eb82c6c71f71a5a5cf70e55d80;p=vim

patch 7.4.1618
Problem:    Starting job with output to buffer changes options in the current
            buffer.
Solution:   Set "curbuf" earlier. (Yasuhiro Matsumoto)
---

diff --git a/src/channel.c b/src/channel.c
index b3115adb7..7fe68d5b4 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1003,11 +1003,11 @@ find_buffer(char_u *name, int err)
 	buf = buflist_new(name == NULL || *name == NUL ? NULL : name,
 					       NULL, (linenr_T)0, BLN_LISTED);
 	buf_copy_options(buf, BCO_ENTER);
+	curbuf = buf;
 #ifdef FEAT_QUICKFIX
 	set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
 	set_option_value((char_u *)"bh", 0L, (char_u *)"hide", OPT_LOCAL);
 #endif
-	curbuf = buf;
 	if (curbuf->b_ml.ml_mfp == NULL)
 	    ml_open(curbuf);
 	ml_replace(1, (char_u *)(err ? "Reading from channel error..."
diff --git a/src/version.c b/src/version.c
index 491ded321..03a30812c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1618,
 /**/
     1617,
 /**/