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 a2142aaf4eae04d0c7c86b9b1fcc1341ae6b9177..3a0a6590dbd755f9756c14a367c63fdc70d9ab60 100644 (file)
--- 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 8bbd1e4b12217af29e2941b13b75022a5075299f..d21b8b1a129be6ac71d7b095264fde5ebce4b3e8 100644 (file)
--- 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,
 /**/