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

brammool · brammool · commit d7db27bafd10 · 2018-03-07T23:02:33.000+01:00
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
@@ -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
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1589,
 /**/
     1588,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -8190,8 +8190,8 @@ set_bool_option(`
`8190`	`8190`	`{`
`8191`	`8191`	`# ifdef FEAT_TERMINAL`
`8192`	`8192`	`/* Cannot set 'modifiable' when in Terminal mode. */`
`8193`		`- if (term_in_normal_mode()`
`8194`		`- \|\| (bt_terminal(curbuf) && !term_is_finished(curbuf)))`
	`8193`	`+ if (curbuf->b_p_ma && (term_in_normal_mode() \|\| (bt_terminal(curbuf)`
	`8194`	`+ && curbuf->b_term != NULL && !term_is_finished(curbuf))))`
`8195`	`8195`	`{`
`8196`	`8196`	`curbuf->b_p_ma = FALSE;`
`8197`	`8197`	`return (char_u *)N_("E946: Cannot make a terminal with running job modifiable");`