aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2022-08-18 23:29:47 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-08-18 23:29:47 -0600
commitb7362a2daf0eb434fffd2aaec7cfe8c12b0ed6d1 (patch)
treefc7cd5c62a6a6e11dacd8d5c67fe86e3d12985a7
parentb9a0252822e3969574d4e07e7e85b8292ef5bae0 (diff)
downloadrneovim-b7362a2daf0eb434fffd2aaec7cfe8c12b0ed6d1.tar.gz
rneovim-b7362a2daf0eb434fffd2aaec7cfe8c12b0ed6d1.tar.bz2
rneovim-b7362a2daf0eb434fffd2aaec7cfe8c12b0ed6d1.zip
Fix messaging aronud yanking to support multibyte chars.
-rw-r--r--src/nvim/ops.c6
-rw-r--r--src/nvim/po/da.po2
-rw-r--r--src/nvim/po/fr.po2
-rw-r--r--src/nvim/po/tr.po2
-rw-r--r--src/nvim/po/uk.po2
5 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index af7b9e007a..6f682fc7a1 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3105,7 +3105,11 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
if (oap->regname == NUL) {
*namebuf = NUL;
} else {
- vim_snprintf(namebuf, sizeof(namebuf), _(" into \"%c"), oap->regname);
+ char buf[5];
+ int len = (*utf_char2len) (oap->regname);
+ utf_char2bytes(oap->regname, buf);
+ buf[len] = 0;
+ vim_snprintf(namebuf, sizeof(namebuf), _(" into \"%s"), buf);
}
// redisplay now, so message is not deleted
diff --git a/src/nvim/po/da.po b/src/nvim/po/da.po
index dfcc052288..f2b28ccc90 100644
--- a/src/nvim/po/da.po
+++ b/src/nvim/po/da.po
@@ -4142,7 +4142,7 @@ msgid "freeing %ld lines"
msgstr "frigør %ld linjer"
#, c-format
-msgid " into \"%c"
+msgid " into \"%s"
msgstr " i \"%c"
#, c-format
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 614ba013e6..239d6da211 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -4410,7 +4410,7 @@ msgid "freeing %ld lines"
msgstr "libration de %ld lignes"
#, c-format
-msgid " into \"%c"
+msgid " into \"%s"
msgstr " dans \"%c"
#, c-format
diff --git a/src/nvim/po/tr.po b/src/nvim/po/tr.po
index fae2fd4967..d534666bbb 100644
--- a/src/nvim/po/tr.po
+++ b/src/nvim/po/tr.po
@@ -4149,7 +4149,7 @@ msgid "E748: No previously used register"
msgstr "E748: Daha önce kullanılan bir yazmaç yok"
#, c-format
-msgid " into \"%c"
+msgid " into \"%s"
msgstr " \"%c"
#, c-format
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index da87d50683..1b514ad7c3 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -4132,7 +4132,7 @@ msgid "E748: No previously used register"
msgstr "E748: Регістри перед цим не вживались"
#, c-format
-msgid " into \"%c"
+msgid " into \"%s"
msgstr " у \"%c"
#, c-format