Mercurial > vim

diff src/edit.c @ 3448:c1a6e1745cb5 v7.3.489

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 05 Apr 2012 16:07:06 +0200
parents de60f6fa3d8d
children 75037f9bc97a
line wrap: on
line diff
--- 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