mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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 #6245, closes #6244)
This commit is contained in:
@@ -3651,7 +3651,7 @@ fileinfo(
|
|||||||
#ifdef FEAT_QUICKFIX
|
#ifdef FEAT_QUICKFIX
|
||||||
&& !bt_dontwrite(curbuf)
|
&& !bt_dontwrite(curbuf)
|
||||||
#endif
|
#endif
|
||||||
? _("[New file]") : "",
|
? new_file_message() : "",
|
||||||
(curbuf->b_flags & BF_READERR) ? _("[Read errors]") : "",
|
(curbuf->b_flags & BF_READERR) ? _("[Read errors]") : "",
|
||||||
curbuf->b_p_ro ? (shortmess(SHM_RO) ? _("[RO]")
|
curbuf->b_p_ro ? (shortmess(SHM_RO) ? _("[RO]")
|
||||||
: _("[readonly]")) : "",
|
: _("[readonly]")) : "",
|
||||||
|
@@ -598,6 +598,12 @@ set_file_time(
|
|||||||
}
|
}
|
||||||
#endif // UNIX
|
#endif // UNIX
|
||||||
|
|
||||||
|
char *
|
||||||
|
new_file_message(void)
|
||||||
|
{
|
||||||
|
return shortmess(SHM_NEW) ? _("[New]") : _("[New File]");
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* buf_write() - write to file "fname" lines "start" through "end"
|
* buf_write() - write to file "fname" lines "start" through "end"
|
||||||
*
|
*
|
||||||
@@ -2347,7 +2353,7 @@ restore_backup:
|
|||||||
}
|
}
|
||||||
else if (newfile)
|
else if (newfile)
|
||||||
{
|
{
|
||||||
STRCAT(IObuff, shortmess(SHM_NEW) ? _("[New]") : _("[New File]"));
|
STRCAT(IObuff, new_file_message());
|
||||||
c = TRUE;
|
c = TRUE;
|
||||||
}
|
}
|
||||||
if (no_eol)
|
if (no_eol)
|
||||||
|
@@ -506,7 +506,8 @@ readfile(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dir_of_file_exists(fname))
|
if (dir_of_file_exists(fname))
|
||||||
filemess(curbuf, sfname, (char_u *)_("[New File]"), 0);
|
filemess(curbuf, sfname,
|
||||||
|
(char_u *)new_file_message(), 0);
|
||||||
else
|
else
|
||||||
filemess(curbuf, sfname,
|
filemess(curbuf, sfname,
|
||||||
(char_u *)_("[New DIRECTORY]"), 0);
|
(char_u *)_("[New DIRECTORY]"), 0);
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
/* bufwrite.c */
|
/* 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);
|
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 : */
|
/* vim: set ft=c : */
|
||||||
|
@@ -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&&|3| @21|╚+0#0000001#ffd7ff255|═@9|╝| +0#0000000#ffffff0
|
||||||
|~+0#4040ff13&| @35||+1#0000000&|5+0&&|4| @34
|
|~+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|%
|
|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
|
||||||
|
@@ -17,4 +17,4 @@
|
|||||||
|~| @73
|
|~| @73
|
||||||
|~| @73
|
|~| @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|
|
||||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
966,
|
||||||
/**/
|
/**/
|
||||||
965,
|
965,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user