diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 12:40:23 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-23 21:23:32 +0100 |
| commit | 0b192bf990927657f6f4c6a4a4e406b38bbba01e (patch) | |
| tree | 3cb0a7c98ffd2c94ff2adae0157a61f68975b56f /src | |
| parent | 6aecbbebfd2e2dbe0714242fb6c4b83d40bf22da (diff) | |
| download | rneovim-0b192bf990927657f6f4c6a4a4e406b38bbba01e.tar.gz rneovim-0b192bf990927657f6f4c6a4a4e406b38bbba01e.tar.bz2 rneovim-0b192bf990927657f6f4c6a4a4e406b38bbba01e.zip | |
vim-patch:7.4.485
Problem: Abbreviations don't work. (Toothpik)
Solution: Move the length computation inside the for loop. Compare against
the unescaped key.
https://code.google.com/p/vim/source/detail?r=v7-4-485
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 35 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 21 insertions, 16 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index e9761a7e5d..39227cc199 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -3573,7 +3573,6 @@ 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; @@ -3636,25 +3635,31 @@ 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)) { + int qlen = mp->m_keylen; + char_u *q = mp->m_keys; + int match; + + if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL) { + /* might have CSI escaped mp->m_keys */ + q = vim_strsave(mp->m_keys); + if (q != NULL) { + vim_unescape_csi(q); + qlen = (int)STRLEN(q); + } + } /* find entries with right mode and keys */ - if ( (mp->m_mode & State) - && qlen == len - && !STRNCMP(mp->m_keys, ptr, (size_t)len)) + match = (mp->m_mode & State) + && qlen == len + && !STRNCMP(q, ptr, (size_t)len); + if (q != mp->m_keys) { + free(q); + } + if (match) { break; + } } if (mp != NULL) { /* diff --git a/src/nvim/version.c b/src/nvim/version.c index b2598ada50..473d4f8549 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -253,7 +253,7 @@ static int included_patches[] = { //488, //487, //486, - //485, + 485, //484 NA 483, //482 NA |