diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-02-12 00:24:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 00:24:50 -0800 |
| commit | 68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5 (patch) | |
| tree | 8f60b4a224a943bdfe943c6395d210612212c351 /src/nvim/undo.c | |
| parent | 58ec72f9fdfd186e5154ce82be1da7c65b9c8ea0 (diff) | |
| parent | d54b5997b7472f6c8a6f224801e2cd2e8ddf017b (diff) | |
| download | rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.tar.gz rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.tar.bz2 rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.zip | |
Merge #10433 from erw7/vim-8.1.0027
vim-patch:8.1.{27,32,36,69,70,71,91,92}
Diffstat (limited to 'src/nvim/undo.c')
| -rw-r--r-- | src/nvim/undo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 1f74bada41..df92b2c036 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -2971,7 +2971,10 @@ static char_u *u_save_line(linenr_T lnum) bool bufIsChanged(buf_T *buf) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT { - return !bt_dontwrite(buf) && (buf->b_changed || file_ff_differs(buf, true)); + // In a "prompt" buffer we do respect 'modified', so that we can control + // closing the window by setting or resetting that option. + return (!bt_dontwrite(buf) || bt_prompt(buf)) + && (buf->b_changed || file_ff_differs(buf, true)); } // Return true if any buffer has changes. Also buffers that are not written. |