]>
Commit | Line | Data |
---|---|---|
ef75664d AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.278 | |
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.278 (extra, after 7.1.275) | |
11 | Problem: Build failure when USE_CARBONKEYHANDLER is not defined. | |
12 | Solution: Remove #ifdef. | |
13 | Files: src/gui_mac.c | |
14 | ||
15 | ||
16 | *** ../vim-7.1.277/src/gui_mac.c Wed Mar 12 14:38:51 2008 | |
17 | --- src/gui_mac.c Wed Mar 12 21:40:54 2008 | |
18 | *************** | |
19 | *** 3037,3049 **** | |
20 | gui_mch_init(void) | |
21 | { | |
22 | /* TODO: Move most of this stuff toward gui_mch_init */ | |
23 | ! Rect windRect; | |
24 | ! MenuHandle pomme; | |
25 | EventHandlerRef mouseWheelHandlerRef; | |
26 | - #ifdef USE_CARBONKEYHANDLER | |
27 | EventTypeSpec eventTypeSpec; | |
28 | ! #endif | |
29 | ! ControlRef rootControl; | |
30 | ||
31 | if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr) | |
32 | gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */ | |
33 | --- 3040,3050 ---- | |
34 | gui_mch_init(void) | |
35 | { | |
36 | /* TODO: Move most of this stuff toward gui_mch_init */ | |
37 | ! Rect windRect; | |
38 | ! MenuHandle pomme; | |
39 | EventHandlerRef mouseWheelHandlerRef; | |
40 | EventTypeSpec eventTypeSpec; | |
41 | ! ControlRef rootControl; | |
42 | ||
43 | if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr) | |
44 | gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */ | |
45 | *** ../vim-7.1.277/src/version.c Wed Mar 12 17:37:53 2008 | |
46 | --- src/version.c Wed Mar 12 21:43:22 2008 | |
47 | *************** | |
48 | *** 668,669 **** | |
49 | --- 668,671 ---- | |
50 | { /* Add new patch number below this line */ | |
51 | + /**/ | |
52 | + 278, | |
53 | /**/ | |
54 | ||
55 | -- | |
56 | Would you care for a drink? I mean, if it were, like, | |
57 | disabled and you had to look after it? | |
58 | ||
59 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
60 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
61 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
62 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |