projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.103 (extra) | |
| 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.103 (extra) | |
| 11 | Problem: The macros equal() and CR conflict with a Carbon header file. | |
| 12 | Solution: Rename equal() to equalpos(). Rename CR to CAR. | |
| 13 | Do this in the extra files only. | |
| 14 | Files: src/gui_photon.c, src/gui_w48.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.102/src/gui_photon.c Sat May 17 15:30:51 2003 | |
| 18 | --- src/gui_photon.c Sun Sep 7 23:22:47 2003 | |
| 19 | *************** | |
| 20 | *** 174,185 **** | |
| 21 | {Pk_KP_5, '&', '8'}, /* Undo */ | |
| 22 | ||
| 23 | /* Keys that we want to be able to use any modifier with: */ | |
| 24 | ! {Pk_Return, CR, NUL}, | |
| 25 | {Pk_space, ' ', NUL}, | |
| 26 | {Pk_Tab, TAB, NUL}, | |
| 27 | {Pk_Escape, ESC, NUL}, | |
| 28 | {NL, NL, NUL}, | |
| 29 | ! {CR, CR, NUL}, | |
| 30 | ||
| 31 | /* End of list marker: */ | |
| 32 | {0, 0, 0} | |
| 33 | --- 174,185 ---- | |
| 34 | {Pk_KP_5, '&', '8'}, /* Undo */ | |
| 35 | ||
| 36 | /* Keys that we want to be able to use any modifier with: */ | |
| 37 | ! {Pk_Return, CAR, NUL}, | |
| 38 | {Pk_space, ' ', NUL}, | |
| 39 | {Pk_Tab, TAB, NUL}, | |
| 40 | {Pk_Escape, ESC, NUL}, | |
| 41 | {NL, NL, NUL}, | |
| 42 | ! {CAR, CAR, NUL}, | |
| 43 | ||
| 44 | /* End of list marker: */ | |
| 45 | {0, 0, 0} | |
| 46 | *** ../vim-6.2.102/src/gui_w48.c Sun May 25 17:26:06 2003 | |
| 47 | --- src/gui_w48.c Sat Sep 13 16:41:29 2003 | |
| 48 | *************** | |
| 49 | *** 264,270 **** | |
| 50 | {VK_TAB, TAB, NUL}, | |
| 51 | {VK_ESCAPE, ESC, NUL}, | |
| 52 | {NL, NL, NUL}, | |
| 53 | ! {CR, CR, NUL}, | |
| 54 | ||
| 55 | /* End of list marker: */ | |
| 56 | {0, 0, 0} | |
| 57 | --- 269,275 ---- | |
| 58 | {VK_TAB, TAB, NUL}, | |
| 59 | {VK_ESCAPE, ESC, NUL}, | |
| 60 | {NL, NL, NUL}, | |
| 61 | ! {CAR, CAR, NUL}, | |
| 62 | ||
| 63 | /* End of list marker: */ | |
| 64 | {0, 0, 0} | |
| 65 | *** ../vim-6.2.102/src/version.c Sat Sep 27 19:36:47 2003 | |
| 66 | --- src/version.c Sat Sep 27 19:38:18 2003 | |
| 67 | *************** | |
| 68 | *** 632,633 **** | |
| 69 | --- 638,641 ---- | |
| 70 | { /* Add new patch number below this line */ | |
| 71 | + /**/ | |
| 72 | + 103, | |
| 73 | /**/ | |
| 74 | ||
| 75 | -- | |
| 76 | hundred-and-one symptoms of being an internet addict: | |
| 77 | 35. Your husband tells you he's had the beard for 2 months. | |
| 78 | ||
| 79 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 80 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 81 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 82 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |