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)
diff --git a/src/edit.c b/src/edit.c
index e95dddd..c8320a6 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1455,13 +1455,16 @@
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
diff --git a/src/getchar.c b/src/getchar.c
index dc7d768..606d9a2 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4352,8 +4352,9 @@
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;
/*
diff --git a/src/version.c b/src/version.c
index 8bcdd30..d012d99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 489,
+/**/
488,
/**/
487,
