summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-20 17:28:35 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-20 17:28:35 +0100
commita4f6ca717b4483eb82c6c71f71a5a5cf70e55d80 (patch)
treefb7adc6399140b2c1364be8ff3bafc6718afca33
parentba61ac0d61f46de7d29c64bb0de6d25c2e378be0 (diff)
patch 7.4.1618v7.4.1618
Problem: Starting job with output to buffer changes options in the current buffer. Solution: Set "curbuf" earlier. (Yasuhiro Matsumoto)
-rw-r--r--src/channel.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c
index b3115adb71..7fe68d5b45 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 491ded3217..03a30812c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1618,
+/**/
1617,
/**/
1616,