IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.483

Browse Source 
Problem:    A 0x80 byte is not handled correctly in abbreviations.
Solution:   Unescape special characters. Add a test. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-483
This commit is contained in:
Florian Walch 2014-12-23 12:24:54 +01:00
parent aa08632caf
commit 6aecbbebfd
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/getchar.c
View File

@ -15,6 +15,7 @@
* mappings and abbreviations * mappings and abbreviations
*/ */
#include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
@ -3572,6 +3573,7 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
int clen = 0; /* length in characters */ int clen = 0; /* length in characters */
int is_id = TRUE; int is_id = TRUE;
int vim_abbr; int vim_abbr;
int qlen; /* length of q, CSI/K_SPECIAL unescaped */
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE; return FALSE;
@ -3634,12 +3636,23 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
mp = mp2; mp = mp2;
mp2 = NULL; mp2 = NULL;
} }
qlen = mp->m_keylen;
if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL) {
char_u *q = vim_strsave(mp->m_keys);
/* might have CSI escaped mp->m_keys */
if (q != NULL) {
vim_unescape_csi(q);
qlen = STRLEN(q);
free(q);
}
}
for (; mp; for (; mp;
mp->m_next == NULL ? (mp = mp2, mp2 = NULL) : mp->m_next == NULL ? (mp = mp2, mp2 = NULL) :
(mp = mp->m_next)) { (mp = mp->m_next)) {
/* find entries with right mode and keys */ /* find entries with right mode and keys */
if ( (mp->m_mode & State) if ( (mp->m_mode & State)
&& mp->m_keylen == len && qlen == len
&& !STRNCMP(mp->m_keys, ptr, (size_t)len)) && !STRNCMP(mp->m_keys, ptr, (size_t)len))
break; break;
} }

2
src/nvim/version.c
View File

@ -255,7 +255,7 @@ static int included_patches[] = {
//486, //486,
//485, //485,
//484 NA //484 NA
//483, 483,
//482 NA //482 NA
//481 NA //481 NA
//480 NA //480 NA

24
test/functional/legacy/mapping_spec.lua Normal file
View File

@ -0,0 +1,24 @@
-- Test for mappings and abbreviations
local helpers = require('test.functional.helpers')
local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
local execute, expect = helpers.execute, helpers.expect
describe('mapping', function()
setup(clear)
it('is working', function()
insert([[
test starts here:
]])
-- Abbreviations with р (0x80) should work.
execute('inoreab чкпр vim')
feed('GAчкпр <cr><esc>')
-- Assert buffer contents.
expect([[
test starts here:
vim]])
end)
end)