diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-25 12:05:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 12:05:06 +0800 |
| commit | 2738f842f6da712ec0648620d846bfacb14bdcef (patch) | |
| tree | f46de8434ad3aa37330355eccb8c149f7f001aa7 | |
| parent | e2a8ea76ea2f7d5e71441f0fac75df35caf85c03 (diff) | |
| parent | 8212bec4e94b42464cf09b37ae475f9bd3402df6 (diff) | |
| download | rneovim-2738f842f6da712ec0648620d846bfacb14bdcef.tar.gz rneovim-2738f842f6da712ec0648620d846bfacb14bdcef.tar.bz2 rneovim-2738f842f6da712ec0648620d846bfacb14bdcef.zip | |
Merge pull request #21186 from zeertzjq/vim-8.2.4155
vim-patch:8.2.{4155,4412}
| -rw-r--r-- | src/nvim/os/time.c | 1 | ||||
| -rw-r--r-- | src/nvim/po/cleanup.vim | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c index 7ba2bd155e..7fc43d7991 100644 --- a/src/nvim/os/time.c +++ b/src/nvim/os/time.c @@ -188,6 +188,7 @@ char *os_ctime_r(const time_t *restrict clock, char *restrict result, size_t res if (clock_local_ptr == NULL) { xstrlcpy(result, _("(Invalid)"), result_len); } else { + // xgettext:no-c-format strftime(result, result_len, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr); } xstrlcat(result, "\n", result_len); diff --git a/src/nvim/po/cleanup.vim b/src/nvim/po/cleanup.vim index 8384286b0d..6df5edd498 100644 --- a/src/nvim/po/cleanup.vim +++ b/src/nvim/po/cleanup.vim @@ -22,7 +22,9 @@ silent g/^msgstr"/s//msgstr "/ silent g/^msgid"/s//msgid "/ silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ / +" clean up empty lines silent g/^\n\n\n/.d +silent! %s/\n\+\%$// if s:was_diff setl diff |