diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 12:24:54 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-23 21:23:32 +0100 |
| commit | 6aecbbebfd2e2dbe0714242fb6c4b83d40bf22da (patch) | |
| tree | ea6340f67ecea39ca2b722ea688e45c9926c271a /src | |
| parent | aa08632caf80d2259d94e8f6e30cd806e3c05a1d (diff) | |
| download | rneovim-6aecbbebfd2e2dbe0714242fb6c4b83d40bf22da.tar.gz rneovim-6aecbbebfd2e2dbe0714242fb6c4b83d40bf22da.tar.bz2 rneovim-6aecbbebfd2e2dbe0714242fb6c4b83d40bf22da.zip | |
vim-patch:7.4.483
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 15 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 882d30388c..e9761a7e5d 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -15,6 +15,7 @@ * mappings and abbreviations */ +#include <assert.h> #include <stdbool.h> #include <string.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 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; @@ -3634,12 +3636,23 @@ int check_abbr(int c, char_u *ptr, int col, int mincol) mp = mp2; 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; mp->m_next == NULL ? (mp = mp2, mp2 = NULL) : (mp = mp->m_next)) { /* 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; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 91f160d83f..b2598ada50 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -255,7 +255,7 @@ static int included_patches[] = { //486, //485, //484 NA - //483, + 483, //482 NA //481 NA //480 NA |