To: vim_dev@googlegroups.com Subject: Patch 8.0.1589 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1589 Problem: Error for setting 'modifiable' when resetting it. Solution: Check if 'modifiable' was actually set. Files: src/option.c *** ../vim-8.0.1588/src/option.c 2018-03-04 20:14:08.252064314 +0100 --- src/option.c 2018-03-07 23:01:39.226681609 +0100 *************** *** 8190,8197 **** { # ifdef FEAT_TERMINAL /* Cannot set 'modifiable' when in Terminal mode. */ ! if (term_in_normal_mode() ! || (bt_terminal(curbuf) && !term_is_finished(curbuf))) { curbuf->b_p_ma = FALSE; return (char_u *)N_("E946: Cannot make a terminal with running job modifiable"); --- 8190,8197 ---- { # ifdef FEAT_TERMINAL /* Cannot set 'modifiable' when in Terminal mode. */ ! 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"); *** ../vim-8.0.1588/src/version.c 2018-03-07 22:09:06.780257074 +0100 --- src/version.c 2018-03-07 22:57:51.768245446 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1589, /**/ -- Lower life forms have more fun! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///