[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Possible merge conflict in src/macterm.[ch]

From: Andreas Tobler
Subject: Re: Possible merge conflict in src/macterm.[ch]
Date: Mon, 28 Jan 2008 19:51:50 +0100
User-agent: Thunderbird (Macintosh/20071031)

Andreas Tobler wrote:
Miles Bader wrote:

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

Please check the state of macterm.[ch] in the trunk and make sure it is

[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 @@
              mac_prepare_for_quickdraw (f);
-             Draw1Control (SCROLL_BAR_CONTROL_HANDLE (bar));
+             Draw1Control (SCROLL_BAR_CONTROL_REF (bar));


reply via email to

[Prev in Thread] Current Thread [Next in Thread]