Permalink
Browse files

updated for version 7.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)
  • Loading branch information...
brammool committed Apr 5, 2012
1 parent 3dbde62 commit e0ebfd75077c5010f31fcecefb87f9fe06889131
Showing with 10 additions and 4 deletions.
  1. +5 −2 src/edit.c
  2. +3 −2 src/getchar.c
  3. +2 −0 src/version.c
View
@@ -1455,13 +1455,16 @@ edit(cmdchar, startln, count)
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
View
@@ -4352,8 +4352,9 @@ check_abbr(c, ptr, col, mincol)
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE;
if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0)
/* no remapping implies no abbreviation */
/* no remapping implies no abbreviation, except for CTRL-] */
if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0 && c != Ctrl_RSB)
return FALSE;
/*
View
@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
489,
/**/
488,
/**/

0 comments on commit e0ebfd7

Please sign in to comment.