Mercurial > vim
comparison src/memline.c @ 14593:b6b2f7d69c7f v8.1.0310
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
commit https://github.com/vim/vim/commit/2f0f871159b2cba862fcd41edab65b17da75c422
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 21 18:50:18 2018 +0200
patch 8.1.0310: file info msg not always suppressed with 'F' in 'shortmess'
Problem: File info message not always suppressed with 'F' in 'shortmess'.
(Asheq Imran)
Solution: Save and restore msg_silent. (Christian Brabandt, closes #3221)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 21 Aug 2018 19:00:06 +0200 |
parents | 23d6d9e9ae3e |
children | 72d6f6f7ead7 |
comparison
equal
deleted
inserted
replaced
14592:304b849109ac | 14593:b6b2f7d69c7f |
---|---|
826 * If still need to create a swap file, and starting to edit a not-readonly | 826 * If still need to create a swap file, and starting to edit a not-readonly |
827 * file, or reading into an existing buffer, create a swap file now. | 827 * file, or reading into an existing buffer, create a swap file now. |
828 */ | 828 */ |
829 void | 829 void |
830 check_need_swap( | 830 check_need_swap( |
831 int newfile) /* reading file into new buffer */ | 831 int newfile) // reading file into new buffer |
832 { | 832 { |
833 int old_msg_silent = msg_silent; // might be reset by an E325 message | |
834 | |
833 if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) | 835 if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) |
834 ml_open_file(curbuf); | 836 ml_open_file(curbuf); |
837 msg_silent = old_msg_silent; | |
835 } | 838 } |
836 | 839 |
837 /* | 840 /* |
838 * Close memline for buffer 'buf'. | 841 * Close memline for buffer 'buf'. |
839 * If 'del_file' is TRUE, delete the swap file | 842 * If 'del_file' is TRUE, delete the swap file |