projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.335 | |
| 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.335 | |
| 11 | Problem: When 'imdisable' is reset from an autocommand in Insert mode it | |
| 12 | doesn't take effect. | |
| 13 | Solution: Call im_set_active() in Insert mode. (Taro Muraoka) | |
| 14 | Files: src/option.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.334/src/option.c 2011-09-21 13:40:13.000000000 +0200 | |
| 18 | --- src/option.c 2011-10-12 14:09:46.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 7806,7811 **** | |
| 21 | --- 7806,7815 ---- | |
| 22 | /* Only de-activate it here, it will be enabled when changing mode. */ | |
| 23 | if (p_imdisable) | |
| 24 | im_set_active(FALSE); | |
| 25 | + else if (State & INSERT) | |
| 26 | + /* When the option is set from an autocommand, it may need to take | |
| 27 | + * effect right away. */ | |
| 28 | + im_set_active(curbuf->b_p_iminsert == B_IMODE_IM); | |
| 29 | } | |
| 30 | #endif | |
| 31 | ||
| 32 | *** ../vim-7.3.334/src/version.c 2011-10-12 14:11:43.000000000 +0200 | |
| 33 | --- src/version.c 2011-10-12 16:56:30.000000000 +0200 | |
| 34 | *************** | |
| 35 | *** 711,712 **** | |
| 36 | --- 711,714 ---- | |
| 37 | { /* Add new patch number below this line */ | |
| 38 | + /**/ | |
| 39 | + 335, | |
| 40 | /**/ | |
| 41 | ||
| 42 | -- | |
| 43 | Time is money. Especially if you make clocks. | |
| 44 | ||
| 45 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 46 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 47 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 48 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |