diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-04-05 16:07:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-04-05 16:07:06 +0200 |
| commit | e0ebfd75077c5010f31fcecefb87f9fe06889131 (patch) | |
| tree | 5cc9da7eb2b75cdf1ccff55f28ff01830cb33061 /src/edit.c | |
| parent | 3dbde6226dbe05289215c1145e35961539ecd5a0 (diff) | |
updated for version 7.3.489v7.3.489
Problem: CTRL-] in Insert mode does not expand abbreviation when used in a
mapping. (Yichao Zhou)
Solution: Special case using CTRL-]. (Christian Brabandt)
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c index e95ddddc25..c8320a6e23 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1455,13 +1455,16 @@ normalchar: Insstart_blank_vcol = get_nolist_virtcol(); } - if (vim_iswordc(c) || !echeck_abbr( + /* Insert a normal character and check for abbreviations on a + * special character. Let CTRL-] expand abbreviations without + * inserting it. */ + if (vim_iswordc(c) || (!echeck_abbr( #ifdef FEAT_MBYTE /* Add ABBR_OFF for characters above 0x100, this is * what check_abbr() expects. */ (has_mbyte && c >= 0x100) ? (c + ABBR_OFF) : #endif - c)) + c) && c != Ctrl_RSB)) { insert_special(c, FALSE, FALSE); #ifdef FEAT_RIGHTLEFT |