mirror of
https://github.com/neovim/neovim.git
synced 2025-11-06 02:34:28 +00:00
Merge pull request #21186 from zeertzjq/vim-8.2.4155
vim-patch:8.2.{4155,4412}
This commit is contained in:
@@ -188,6 +188,7 @@ char *os_ctime_r(const time_t *restrict clock, char *restrict result, size_t res
|
|||||||
if (clock_local_ptr == NULL) {
|
if (clock_local_ptr == NULL) {
|
||||||
xstrlcpy(result, _("(Invalid)"), result_len);
|
xstrlcpy(result, _("(Invalid)"), result_len);
|
||||||
} else {
|
} else {
|
||||||
|
// xgettext:no-c-format
|
||||||
strftime(result, result_len, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr);
|
strftime(result, result_len, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr);
|
||||||
}
|
}
|
||||||
xstrlcat(result, "\n", result_len);
|
xstrlcat(result, "\n", result_len);
|
||||||
|
|||||||
@@ -22,7 +22,9 @@ silent g/^msgstr"/s//msgstr "/
|
|||||||
silent g/^msgid"/s//msgid "/
|
silent g/^msgid"/s//msgid "/
|
||||||
silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
|
silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
|
||||||
|
|
||||||
|
" clean up empty lines
|
||||||
silent g/^\n\n\n/.d
|
silent g/^\n\n\n/.d
|
||||||
|
silent! %s/\n\+\%$//
|
||||||
|
|
||||||
if s:was_diff
|
if s:was_diff
|
||||||
setl diff
|
setl diff
|
||||||
|
|||||||
Reference in New Issue
Block a user