From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Mon, 01 Nov 2010 12:02:31 -0400 Message-ID: <87aaltc9rc.fsf@stupidchicken.com> References: <4CCEC526.3070502@cornell.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288634007 28517 80.91.229.12 (1 Nov 2010 17:53:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Nov 2010 17:53:27 +0000 (UTC) Cc: Michael Albinus , Emacs To: Ken Brown Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 01 18:53:22 2010 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.69) (envelope-from ) id 1PCyZM-0001jm-VK for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 18:53:21 +0100 Original-Received: from localhost ([127.0.0.1]:55145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCxzv-00020P-TL for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 13:16:43 -0400 Original-Received: from [140.186.70.92] (port=45877 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCwrN-0003Re-P6 for emacs-devel@gnu.org; Mon, 01 Nov 2010 12:03:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCwqE-0004Jd-5E for emacs-devel@gnu.org; Mon, 01 Nov 2010 12:02:41 -0400 Original-Received: from pantheon-po16.its.yale.edu ([130.132.50.72]:44554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCwqE-0004JJ-3P for emacs-devel@gnu.org; Mon, 01 Nov 2010 12:02:38 -0400 Original-Received: from furball (dhcp128036014027.central.yale.edu [128.36.14.27]) (authenticated bits=0) by pantheon-po16.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id oA1G2XNe012356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 1 Nov 2010 12:02:33 -0400 Original-Received: by furball (Postfix, from userid 1000) id 143CD16108B; Mon, 1 Nov 2010 12:02:31 -0400 (EDT) In-Reply-To: <4CCEC526.3070502@cornell.edu> (Ken Brown's message of "Mon, 01 Nov 2010 09:48:22 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 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:132245 Archived-At: Ken Brown writes: > It looks like the following change got merged with the trunk inadvertently: > > revno: 100136 > committer: Michael Albinus > branch nick: emacs-23 > timestamp: Mon 2010-10-25 13:46:21 +0200 > message: > * dbusbind.c (Fdbus_call_method_asynchronously) > (Fdbus_register_signal, Fdbus_register_method): Check, whether > `dbus-registered-objects-table' is initialized. > > Must not be synchronized with the trunk. Should be fixed now, thanks.