Mercurial > vim
changeset 6299:3eb160c5b3a1 v7.4.483
updated for version 7.4.483
Problem: A 0x80 byte is not handled correctly in abbreviations.
Solution: Unescape special characters. Add a test. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 21 Oct 2014 16:22:17 +0200 |
| parents | db025bc8fea1 |
| children | bb986c646350 |
| files | src/getchar.c src/testdir/Make_amiga.mak src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Make_os2.mak src/testdir/Make_vms.mms src/testdir/Makefile src/testdir/test_mapping.in src/testdir/test_mapping.ok src/version.c |
| diffstat | 10 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -4443,6 +4443,7 @@ check_abbr(c, ptr, col, mincol) #endif int is_id = TRUE; int vim_abbr; + int qlen; /* length of q, CSI/K_SPECIAL unescaped */ if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ return FALSE; @@ -4520,6 +4521,19 @@ check_abbr(c, ptr, col, mincol) #else mp = first_abbr; #endif + 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); + vim_free(q); + } + } for ( ; mp; #ifdef FEAT_LOCALMAP mp->m_next == NULL ? (mp = mp2, mp2 = NULL) : @@ -4528,7 +4542,7 @@ check_abbr(c, ptr, col, mincol) { /* find entries with right mode and keys */ if ( (mp->m_mode & State) - && mp->m_keylen == len + && qlen == len && !STRNCMP(mp->m_keys, ptr, (size_t)len)) break; }
--- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -43,6 +43,7 @@ SCRIPTS = test1.out test3.out test4.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
--- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -42,6 +42,7 @@ SCRIPTS = test3.out test4.out test5.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
--- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -62,6 +62,7 @@ SCRIPTS = test3.out test4.out test5.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
--- a/src/testdir/Make_os2.mak +++ b/src/testdir/Make_os2.mak @@ -44,6 +44,7 @@ SCRIPTS = test1.out test3.out test4.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
--- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -103,6 +103,7 @@ SCRIPT = test1.out test2.out test3.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -40,6 +40,7 @@ SCRIPTS = test1.out test2.out test3.out test_insertcount.out \ test_listlbr.out \ test_listlbr_utf8.out \ + test_mapping.out \ test_options.out \ test_qf_title.out \ test_utf8.out
new file mode 100644 --- /dev/null +++ b/src/testdir/test_mapping.in @@ -0,0 +1,15 @@ +Test for mappings and abbreviations + +STARTTEST +:so small.vim +:so mbyte.vim +: " abbreviations with р (0x80) should work +:inoreab чкпр vim +GAчкпр + +:/^test/,$w! test.out +:qa! +ENDTEST + +test starts here: +