From d7db27bafd1045281c965d9483539748a744de70 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 7 Mar 2018 23:02:33 +0100 Subject: [PATCH] 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. --- src/option.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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, /**/