From ca49ae9e361d2b3daace2c6bb677e1cca78b8e8d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 3 Apr 2019 19:28:12 -0400 Subject: vim-patch:8.1.0135: undo message delays screen update for CTRL-O u Problem: Undo message delays screen update for CTRL-O u. Solution: Add smsg_attr_keep(). (closes vim/vim#3125) https://github.com/vim/vim/commit/e0429681aed5448d1c3b8399d152a2b1a05ea6d7 --- src/nvim/undo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nvim/undo.c') diff --git a/src/nvim/undo.c b/src/nvim/undo.c index df0507ed41..1534a943e9 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -2452,7 +2452,9 @@ static void u_undo_end( } } - smsg(_("%" PRId64 " %s; %s #%" PRId64 " %s"), + smsg_attr_keep( + 0, + _("%" PRId64 " %s; %s #%" PRId64 " %s"), u_oldcount < 0 ? (int64_t)-u_oldcount : (int64_t)u_oldcount, _(msgstr), did_undo ? _("before") : _("after"), -- cgit From e2f845632d68835dacccd477fd6c6a23e2da1249 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 4 Apr 2019 20:57:28 -0400 Subject: vim-patch:8.1.0308: a quick undo shows "1 seconds ago" Problem: A quick undo shows "1 seconds ago". (Tony Mechelynck) Solution: Add singular/plural message. https://github.com/vim/vim/commit/fd6100b2aa6178b88cfadcdbc494966bf79a5488 --- src/nvim/undo.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/nvim/undo.c') diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 1534a943e9..41393c7ef4 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -2587,9 +2587,13 @@ static void u_add_time(char_u *buf, size_t buflen, time_t tt) else /* longer ago */ (void)strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", &curtime); - } else - vim_snprintf((char *)buf, buflen, _("%" PRId64 " seconds ago"), - (int64_t)(time(NULL) - tt)); + } else { + int64_t seconds = time(NULL) - tt; + vim_snprintf((char *)buf, buflen, + NGETTEXT("%" PRId64 " second ago", + "%" PRId64 " seconds ago", (uint32_t)seconds), + seconds); + } } /* -- cgit