|
From: | Andreas Tobler |
Subject: | Re: Possible merge conflict in src/macterm.[ch] |
Date: | Mon, 28 Jan 2008 19:51:50 +0100 |
User-agent: | Thunderbird 2.0.0.9 (Macintosh/20071031) |
Andreas Tobler wrote:
Miles Bader wrote:Hi, I merged the appended changes to macterm.[ch] from the Emacs 22 release branch to the trunk. As there were merge conflicts, and apparently some trunk changes touched the same code, it seems likely that either this change shouldn't have been merged, or that I incorrectly resolved the conflict. Please check the state of macterm.[ch] in the trunk and make sure it is correct. [The appended ChangeLog entry is the original, but the diff is the change I applied to the trunk, after I tried to fix the conflicts.]It's wrong or at least incomplete. Only the .c is merged. I guess the .h needs a merge as well.I try to figure out what's missing.
This one fixes bootstrap on OS-X 10.5.1 for me: Index: macterm.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/macterm.c,v retrieving revision 1.242 diff -u -r1.242 macterm.c --- macterm.c 22 Jan 2008 23:53:38 -0000 1.242 +++ macterm.c 28 Jan 2008 18:50:42 -0000 @@ -5300,7 +5300,7 @@ #if USE_CG_DRAWING mac_prepare_for_quickdraw (f); #endif - Draw1Control (SCROLL_BAR_CONTROL_HANDLE (bar)); + Draw1Control (SCROLL_BAR_CONTROL_REF (bar)); } } else Andreas
[Prev in Thread] | Current Thread | [Next in Thread] |