From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 7 Mar 2018 22:02:33 +0000 (+0100)
Subject: patch 8.0.1589: error for setting 'modifiable' when resetting it
X-Git-Tag: v8.0.1589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7db27bafd1045281c965d9483539748a744de70;p=vim

patch 8.0.1589: error for setting 'modifiable' when resetting it

Problem:    Error for setting 'modifiable' when resetting it.
Solution:   Check if 'modifiable' was actually set.
---

diff --git a/src/option.c b/src/option.c
index a2142aaf4..3a0a6590d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8190,8 +8190,8 @@ set_bool_option(
     {
 # ifdef FEAT_TERMINAL
 	/* Cannot set 'modifiable' when in Terminal mode. */
-	if (term_in_normal_mode()
-			 || (bt_terminal(curbuf) && !term_is_finished(curbuf)))
+	if (curbuf->b_p_ma && (term_in_normal_mode() || (bt_terminal(curbuf)
+		      && curbuf->b_term != NULL && !term_is_finished(curbuf))))
 	{
 	    curbuf->b_p_ma = FALSE;
 	    return (char_u *)N_("E946: Cannot make a terminal with running job modifiable");
diff --git a/src/version.c b/src/version.c
index 8bbd1e4b1..d21b8b1a1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1589,
 /**/
     1588,
 /**/