projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 51f9884c AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.418 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.418 | |
| 11 | Problem: Using ":nnoremap <F12> :echo "cheese" and ":cabbr cheese xxx": | |
| 12 | when pressing <F12> still uses the abbreviation. (Hari Krishna) | |
| 13 | Solution: Also apply "noremap" to abbreviations. | |
| 14 | Files: src/getchar.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.417/src/getchar.c Fri Mar 26 22:02:11 2004 | |
| 18 | --- src/getchar.c Mon Mar 29 22:18:46 2004 | |
| 19 | *************** | |
| 20 | *** 76,81 **** | |
| 21 | --- 76,83 ---- | |
| 22 | */ | |
| 23 | static mapblock_T *first_abbr = NULL; /* first entry in abbrlist */ | |
| 24 | ||
| 25 | + static int KeyNoremap = FALSE; /* remapping disabled */ | |
| 26 | + | |
| 27 | /* | |
| 28 | * variables used by vgetorpeek() and flush_buffers() | |
| 29 | * | |
| 30 | *************** | |
| 31 | *** 2118,2123 **** | |
| 32 | --- 2120,2127 ---- | |
| 33 | gotchars(typebuf.tb_buf | |
| 34 | + typebuf.tb_off, 1); | |
| 35 | } | |
| 36 | + KeyNoremap = (typebuf.tb_noremap[ | |
| 37 | + typebuf.tb_off] != REMAP_YES); | |
| 38 | del_typebuf(1, 0); | |
| 39 | } | |
| 40 | break; /* got character, break for loop */ | |
| 41 | *************** | |
| 42 | *** 3903,3908 **** | |
| 43 | --- 3907,3914 ---- | |
| 44 | int vim_abbr; | |
| 45 | ||
| 46 | if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ | |
| 47 | + return FALSE; | |
| 48 | + if (KeyNoremap) /* no remapping implies no abbreviation */ | |
| 49 | return FALSE; | |
| 50 | ||
| 51 | /* | |
| 52 | *** ../vim-6.2.417/src/version.c Tue Mar 30 21:58:19 2004 | |
| 53 | --- src/version.c Tue Mar 30 21:59:55 2004 | |
| 54 | *************** | |
| 55 | *** 639,640 **** | |
| 56 | --- 639,642 ---- | |
| 57 | { /* Add new patch number below this line */ | |
| 58 | + /**/ | |
| 59 | + 418, | |
| 60 | /**/ | |
| 61 | ||
| 62 | -- | |
| 63 | Some of the well know MS-Windows errors: | |
| 64 | EHUH Unexpected error | |
| 65 | EUSER User error, not our fault! | |
| 66 | EGOD Horrible problem, god knows what has happened | |
| 67 | EERR Errornous error: nothing wrong | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 71 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 72 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |