thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0966: 'shortmess' flag "n" not used in two places

Browse Source 
Problem:    'shortmess' flag "n" not used in two places.
Solution:   Make use of the "n" flag consistent. (Nick Jensen, closes #6245,
            closes #6244)
This commit is contained in:
Bram Moolenaar
2020-06-12 22:31:00 +02:00
parent 5055c56cfb
commit 722e505d1a
7 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.c
View File

@@ -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]")) : "",

8
src/bufwrite.c
View File

@@ -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)

3
src/fileio.c
View File

@@ -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);

1
src/proto/bufwrite.pro
View File

@@ -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 : */

2
src/testdir/dumps/Test_popup_textprop_corn_5.dump
View File

@@ -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

2
src/testdir/dumps/Test_start_with_tabs.dump
View File

@@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
|"+0#0000000&|a|"| |[|N|e|w| |F|i|l|e|]| @42|0|,|0|-|1| @8|A|l@1|
|"+0#0000000&|a|"| |[|N|e|w|]| @47|0|,|0|-|1| @8|A|l@1|

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
966,
/**/
965,
/**/