From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Tobler Newsgroups: gmane.emacs.devel Subject: Re: Possible merge conflict in src/macterm.[ch] Date: Mon, 28 Jan 2008 19:51:50 +0100 Message-ID: <479E2446.5060100@fgznet.ch> References: <61lk6hwgnc.fsf@fencepost.gnu.org> <479D00C6.8040905@fgznet.ch> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1201546405 6303 80.91.229.12 (28 Jan 2008 18:53:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Jan 2008 18:53:25 +0000 (UTC) Cc: YAMAMOTO Mitsuharu , emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 28 19:53:45 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JJZ6z-0001kU-TL for ged-emacs-devel@m.gmane.org; Mon, 28 Jan 2008 19:53:42 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JJZ6V-00042l-8c for ged-emacs-devel@m.gmane.org; Mon, 28 Jan 2008 13:53:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JJZ6R-00042g-S5 for emacs-devel@gnu.org; Mon, 28 Jan 2008 13:53:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JJZ6N-00041E-73 for emacs-devel@gnu.org; Mon, 28 Jan 2008 13:53:07 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JJZ6N-00041B-3J for emacs-devel@gnu.org; Mon, 28 Jan 2008 13:53:03 -0500 Original-Received: from mail.fgznet.ch ([81.92.96.47] helo=smtp.fgznet.ch) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JJZ6B-0005Jf-7c; Mon, 28 Jan 2008 13:52:54 -0500 Original-Received: from wolfram.andreas.nets ([91.190.8.131]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id m0SIpolf016343; Mon, 28 Jan 2008 19:51:51 +0100 (CET) (envelope-from andreast-list@fgznet.ch) User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) In-Reply-To: <479D00C6.8040905@fgznet.ch> X-Scanned-By: MIMEDefang 2.62 on 81.92.96.47 X-detected-kernel: by monty-python.gnu.org: FreeBSD 6.x (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:87721 Archived-At: 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