# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1520460905 -3600
# Node ID 1bb09ac80ef6ba5bd0b41ab8db8a4457ee85bac5
# Parent  b82547f4a465b73841fe837e7e65206977e626ae
patch 8.0.1589: error for setting 'modifiable' when resetting it

commit https://github.com/vim/vim/commit/d7db27bafd1045281c965d9483539748a744de70
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 7 23:02:33 2018 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1589,
+/**/
     1588,
 /**/
     1587,