projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| eb0ac1ae AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.133 | |
| 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.133 | |
| 11 | Problem: When starting the GUI a bogus error message about 'imactivatekey' | |
| 12 | may be given. | |
| 13 | Solution: Only check the value of 'imactivatekey' when the GUI is running. | |
| 14 | Files: src/gui.c, src/option.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.132/src/gui.c Sat Sep 27 19:36:46 2003 | |
| 18 | --- src/gui.c Thu Oct 23 14:27:43 2003 | |
| 19 | *************** | |
| 20 | *** 538,543 **** | |
| 21 | --- 538,548 ---- | |
| 22 | /* Tell the client that it can start sending commands. */ | |
| 23 | netbeans_startup_done(); | |
| 24 | #endif | |
| 25 | + #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
| 26 | + if (!im_xim_isvalid_imactivate()) | |
| 27 | + EMSG(_("E599: Value of 'imactivatekey' is invalid")); | |
| 28 | + #endif | |
| 29 | + | |
| 30 | return; | |
| 31 | } | |
| 32 | ||
| 33 | *** ../vim-6.2.132/src/option.c Sat Sep 27 19:42:53 2003 | |
| 34 | --- src/option.c Thu Oct 23 14:20:19 2003 | |
| 35 | *************** | |
| 36 | *** 4774,4780 **** | |
| 37 | #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
| 38 | else if (varp == &p_imak) | |
| 39 | { | |
| 40 | ! if (!im_xim_isvalid_imactivate()) | |
| 41 | errmsg = e_invarg; | |
| 42 | } | |
| 43 | #endif | |
| 44 | --- 4774,4780 ---- | |
| 45 | #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
| 46 | else if (varp == &p_imak) | |
| 47 | { | |
| 48 | ! if (gui.in_use && !im_xim_isvalid_imactivate()) | |
| 49 | errmsg = e_invarg; | |
| 50 | } | |
| 51 | #endif | |
| 52 | *** ../vim-6.2.132/src/version.c Sun Oct 26 20:15:06 2003 | |
| 53 | --- src/version.c Sun Oct 26 20:18:19 2003 | |
| 54 | *************** | |
| 55 | *** 639,640 **** | |
| 56 | --- 639,642 ---- | |
| 57 | { /* Add new patch number below this line */ | |
| 58 | + /**/ | |
| 59 | + 133, | |
| 60 | /**/ | |
| 61 | ||
| 62 | -- | |
| 63 | ARTHUR: Bloody peasant! | |
| 64 | DENNIS: Oh, what a give away. Did you here that, did you here that, eh? | |
| 65 | That's what I'm on about -- did you see him repressing me, you saw it | |
| 66 | didn't you? | |
| 67 | The Quest for the Holy Grail (Monty Python) | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 71 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 72 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |