Mercurial > vim
changeset 20828:db18625d8134 v8.2.0966
patch 8.2.0966: 'shortmess' flag "n" not used in two places
Commit: https://github.com/vim/vim/commit/722e505d1a55dfde5ab62241d10da91d2e10c3c1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jun 12 22:31:00 2020 +0200
patch 8.2.0966: 'shortmess' flag "n" not used in two places
Problem: 'shortmess' flag "n" not used in two places.
Solution: Make use of the "n" flag consistent. (Nick Jensen, closes https://github.com/vim/vim/issues/6245,
closes #6244)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 12 Jun 2020 22:45:04 +0200 |
parents | 0b2d6030068c |
children | 3d0d6410aecd |
files | src/buffer.c src/bufwrite.c src/fileio.c src/proto/bufwrite.pro src/testdir/dumps/Test_popup_textprop_corn_5.dump src/testdir/dumps/Test_start_with_tabs.dump src/version.c |
diffstat | 7 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -3651,7 +3651,7 @@ fileinfo( #ifdef FEAT_QUICKFIX && !bt_dontwrite(curbuf) #endif - ? _("[New file]") : "", + ? new_file_message() : "", (curbuf->b_flags & BF_READERR) ? _("[Read errors]") : "", curbuf->b_p_ro ? (shortmess(SHM_RO) ? _("[RO]") : _("[readonly]")) : "",
--- a/src/bufwrite.c +++ b/src/bufwrite.c @@ -598,6 +598,12 @@ set_file_time( } #endif // UNIX + char * +new_file_message(void) +{ + return shortmess(SHM_NEW) ? _("[New]") : _("[New File]"); +} + /* * buf_write() - write to file "fname" lines "start" through "end" * @@ -2347,7 +2353,7 @@ restore_backup: } else if (newfile) { - STRCAT(IObuff, shortmess(SHM_NEW) ? _("[New]") : _("[New File]")); + STRCAT(IObuff, new_file_message()); c = TRUE; } if (no_eol)
--- a/src/fileio.c +++ b/src/fileio.c @@ -506,7 +506,8 @@ readfile( } } if (dir_of_file_exists(fname)) - filemess(curbuf, sfname, (char_u *)_("[New File]"), 0); + filemess(curbuf, sfname, + (char_u *)new_file_message(), 0); else filemess(curbuf, sfname, (char_u *)_("[New DIRECTORY]"), 0);
--- a/src/proto/bufwrite.pro +++ b/src/proto/bufwrite.pro @@ -1,3 +1,4 @@ /* bufwrite.c */ +char *new_file_message(void); int buf_write(buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering); /* vim: set ft=c : */
--- a/src/testdir/dumps/Test_popup_textprop_corn_5.dump +++ b/src/testdir/dumps/Test_popup_textprop_corn_5.dump @@ -9,4 +9,4 @@ |~+0#4040ff13&| @35||+1#0000000&|5+0&&|3| @21|╚+0#0000001#ffd7ff255|═@9|╝| +0#0000000#ffffff0 |~+0#4040ff13&| @35||+1#0000000&|5+0&&|4| @34 |f+3&&|o@1| @15|0|,|0|-|1| @9|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|4|6|,|1| @10|4|8|% -|"+0&&|f|o@1|"| |[|N|e|w| |F|i|l|e|]| @58 +|"+0&&|f|o@1|"| |[|N|e|w|]| @63