projects / people / ms / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.489 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.489 | |
| 11 | Problem: CTRL-] in Insert mode does not expand abbreviation when used in a | |
| 12 | mapping. (Yichao Zhou) | |
| 13 | Solution: Special case using CTRL-]. (Christian Brabandt) | |
| 14 | Files: src/getchar.c, src/edit.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.488/src/getchar.c 2012-02-05 22:05:44.000000000 +0100 | |
| 18 | --- src/getchar.c 2012-04-05 15:54:00.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 4352,4359 **** | |
| 21 | ||
| 22 | if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ | |
| 23 | return FALSE; | |
| 24 | ! if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0) | |
| 25 | ! /* no remapping implies no abbreviation */ | |
| 26 | return FALSE; | |
| 27 | ||
| 28 | /* | |
| 29 | --- 4352,4360 ---- | |
| 30 | ||
| 31 | if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ | |
| 32 | return FALSE; | |
| 33 | ! | |
| 34 | ! /* no remapping implies no abbreviation, except for CTRL-] */ | |
| 35 | ! if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0 && c != Ctrl_RSB) | |
| 36 | return FALSE; | |
| 37 | ||
| 38 | /* | |
| 39 | *** ../vim-7.3.488/src/edit.c 2012-02-29 18:22:03.000000000 +0100 | |
| 40 | --- src/edit.c 2012-04-05 15:57:46.000000000 +0200 | |
| 41 | *************** | |
| 42 | *** 1455,1467 **** | |
| 43 | Insstart_blank_vcol = get_nolist_virtcol(); | |
| 44 | } | |
| 45 | ||
| 46 | ! if (vim_iswordc(c) || !echeck_abbr( | |
| 47 | #ifdef FEAT_MBYTE | |
| 48 | /* Add ABBR_OFF for characters above 0x100, this is | |
| 49 | * what check_abbr() expects. */ | |
| 50 | (has_mbyte && c >= 0x100) ? (c + ABBR_OFF) : | |
| 51 | #endif | |
| 52 | ! c)) | |
| 53 | { | |
| 54 | insert_special(c, FALSE, FALSE); | |
| 55 | #ifdef FEAT_RIGHTLEFT | |
| 56 | --- 1455,1470 ---- | |
| 57 | Insstart_blank_vcol = get_nolist_virtcol(); | |
| 58 | } | |
| 59 | ||
| 60 | ! /* Insert a normal character and check for abbreviations on a | |
| 61 | ! * special character. Let CTRL-] expand abbreviations without | |
| 62 | ! * inserting it. */ | |
| 63 | ! if (vim_iswordc(c) || (!echeck_abbr( | |
| 64 | #ifdef FEAT_MBYTE | |
| 65 | /* Add ABBR_OFF for characters above 0x100, this is | |
| 66 | * what check_abbr() expects. */ | |
| 67 | (has_mbyte && c >= 0x100) ? (c + ABBR_OFF) : | |
| 68 | #endif | |
| 69 | ! c) && c != Ctrl_RSB)) | |
| 70 | { | |
| 71 | insert_special(c, FALSE, FALSE); | |
| 72 | #ifdef FEAT_RIGHTLEFT | |
| 73 | *** ../vim-7.3.488/src/version.c 2012-04-05 16:04:58.000000000 +0200 | |
| 74 | --- src/version.c 2012-04-05 16:06:12.000000000 +0200 | |
| 75 | *************** | |
| 76 | *** 716,717 **** | |
| 77 | --- 716,719 ---- | |
| 78 | { /* Add new patch number below this line */ | |
| 79 | + /**/ | |
| 80 | + 489, | |
| 81 | /**/ | |
| 82 | ||
| 83 | -- | |
| 84 | Just think of all the things we haven't thought of yet. | |
| 85 | ||
| 86 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 87 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 88 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 89 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |