projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.022 | |
| 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 7.1.022 | |
| 11 | Problem: When setting 'keymap' twice the b:keymap_name variable isn't set. | |
| 12 | (Milan Berta) | |
| 13 | Solution: Don't unlet b:keymap_name for ":loadkeymap". (Martin Toft) | |
| 14 | Files: src/digraph.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.021/src/digraph.c Wed May 3 00:07:11 2006 | |
| 18 | --- src/digraph.c Mon Jul 2 21:24:30 2007 | |
| 19 | *************** | |
| 20 | *** 2349,2356 **** | |
| 21 | ||
| 22 | if (*curbuf->b_p_keymap == NUL) | |
| 23 | { | |
| 24 | ! /* Stop any active keymap and clear the table. */ | |
| 25 | keymap_unload(); | |
| 26 | } | |
| 27 | else | |
| 28 | { | |
| 29 | --- 2349,2358 ---- | |
| 30 | ||
| 31 | if (*curbuf->b_p_keymap == NUL) | |
| 32 | { | |
| 33 | ! /* Stop any active keymap and clear the table. Also remove | |
| 34 | ! * b:keymap_unload, as no keymap is active now. */ | |
| 35 | keymap_unload(); | |
| 36 | + do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); | |
| 37 | } | |
| 38 | else | |
| 39 | { | |
| 40 | *************** | |
| 41 | *** 2500,2506 **** | |
| 42 | ||
| 43 | ga_clear(&curbuf->b_kmap_ga); | |
| 44 | curbuf->b_kmap_state &= ~KEYMAP_LOADED; | |
| 45 | - do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); | |
| 46 | #ifdef FEAT_WINDOWS | |
| 47 | status_redraw_curbuf(); | |
| 48 | #endif | |
| 49 | --- 2502,2507 ---- | |
| 50 | *** ../vim-7.1.021/src/version.c Fri Jul 6 19:42:09 2007 | |
| 51 | --- src/version.c Sat Jul 7 13:56:52 2007 | |
| 52 | *************** | |
| 53 | *** 668,669 **** | |
| 54 | --- 668,671 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 22, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | If your life is a hard drive, | |
| 62 | Christ can be your backup. | |
| 63 | ||
| 64 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 65 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 66 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 67 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |