diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-07 23:02:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-07 23:02:33 +0100 |
| commit | d7db27bafd1045281c965d9483539748a744de70 (patch) | |
| tree | 3fc94f3719622ffb49b86d5ffa320bb6b57adbc6 | |
| parent | 52f18a112a073c39187cd93f26115d1e2bfd29ce (diff) | |
| download | vim-git-d7db27bafd1045281c965d9483539748a744de70.tar.gz | |
patch 8.0.1589: error for setting 'modifiable' when resetting itv8.0.1589
Problem: Error for setting 'modifiable' when resetting it.
Solution: Check if 'modifiable' was actually set.
| -rw-r--r-- | src/option.c | 4 | ||||
| -rw-r--r-- | 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 @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1589, +/**/ 1588, /**/ 1587, |