kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

ops: fix i<c-r> with multi-byte text (#6524)

Browse Source
This commit is contained in:
Björn Linse 2017-04-15 11:19:40 +02:00 committed by Justin M. Keyes
parent 58d2ce9bdb
commit 12fc1defd6
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/getchar.c
View File

@ -302,13 +302,13 @@ static void add_num_buff(buffheader_T *buf, long n)
*/ */
static void add_char_buff(buffheader_T *buf, int c) static void add_char_buff(buffheader_T *buf, int c)
{ {
char bytes[MB_MAXBYTES + 1]; uint8_t bytes[MB_MAXBYTES + 1];
int len; int len;
if (IS_SPECIAL(c)) { if (IS_SPECIAL(c)) {
len = 1; len = 1;
} else { } else {
len = (*mb_char2bytes)(c, (char_u *)bytes); len = mb_char2bytes(c, bytes);
} }
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {

19
test/functional/insert/ctrl_r_spec.lua Normal file
View File

@ -0,0 +1,19 @@
local helpers = require('test.functional.helpers')(after_each)
local clear, feed = helpers.clear, helpers.feed
local expect, command = helpers.expect, helpers.command
describe('insert-mode Ctrl-R', function()
before_each(clear)
it('works', function()
command("let @@ = 'test'")
feed('i<C-r>"')
expect('test')
end)
it('works with multi-byte text', function()
command("let @@ = 'påskägg'")
feed('i<C-r>"')
expect('påskägg')
end)
end)