From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Reading D-Bus messages Date: Mon, 27 Sep 2010 23:23:58 +0200 Message-ID: <878w2mzxqp.fsf@gmx.de> References: <878w2tx6gk.fsf@gmx.de> <4C9B452E.1040101@cornell.edu> <4C9B63A1.2060604@cornell.edu> <87y6asy0uh.fsf@gmx.de> <4C9BBD5C.30201@cornell.edu> <83tylgtbo8.fsf@gnu.org> <871v8jhcw2.fsf@gmx.de> <4C9CB57E.1010708@swipnet.se> <8339sztayd.fsf@gnu.org> <87tyleetju.fsf@gmx.de> <4C9DA26F.4030007@swipnet.se> <87mxr5epfa.fsf@gmx.de> <4C9E39A1.8050608@swipnet.se> <87hbhdee7k.fsf@gmx.de> <4C9F7563.3090608@swipnet.se> <87mxr4bb9s.fsf@gmx.de> <4C9F9C49.5090107@swipnet.se> <87bp7jb3jy.fsf@gmx.de> <4CA0F23B.6050109@cornell.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1285622660 7888 80.91.229.12 (27 Sep 2010 21:24:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 27 Sep 2010 21:24:20 +0000 (UTC) Cc: Jan =?utf-8?Q?Dj=C3=A4rv?= , emacs-devel To: Ken Brown Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 27 23:24:19 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 1P0LBJ-0005KJ-C7 for ged-emacs-devel@m.gmane.org; Mon, 27 Sep 2010 23:24:17 +0200 Original-Received: from localhost ([127.0.0.1]:49225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0LBI-0000u6-Ng for ged-emacs-devel@m.gmane.org; Mon, 27 Sep 2010 17:24:16 -0400 Original-Received: from [140.186.70.92] (port=54397 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0LBC-0000tG-38 for emacs-devel@gnu.org; Mon, 27 Sep 2010 17:24:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0LB9-0003RT-AP for emacs-devel@gnu.org; Mon, 27 Sep 2010 17:24:08 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.23]:36480 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1P0LB8-0003RG-Vd for emacs-devel@gnu.org; Mon, 27 Sep 2010 17:24:07 -0400 Original-Received: (qmail invoked by alias); 27 Sep 2010 21:24:04 -0000 Original-Received: from p4FC19466.dip0.t-ipconnect.de (EHLO detlef.gmx.de) [79.193.148.102] by mail.gmx.net (mp003) with SMTP; 27 Sep 2010 23:24:04 +0200 X-Authenticated: #3708877 X-Provags-ID: V01U2FsdGVkX1/u1Hgc43DusHg9lVTlIUGW0YNsPdZDzxXCkRXrre bPwB9Qk5SWQjEY In-Reply-To: <4CA0F23B.6050109@cornell.edu> (Ken Brown's message of "Mon, 27 Sep 2010 15:36:27 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:131034 Archived-At: Ken Brown writes: > To finish off the Cygwin issue that started this thread, dbus now > works fine in emacs-24 under Cygwin, but not in emacs-23. Would > anyone object if I were to apply the following patch to the emacs-23 > branch to fix the (Cygwin-specific) problem there? > > === modified file 'src/keyboard.c' > --- src/keyboard.c 2010-07-05 17:16:59 +0000 > +++ src/keyboard.c 2010-09-27 19:33:05 +0000 > @@ -4107,7 +4107,7 @@ > interrupt handlers have not read it, read it now. */ > > /* Note SIGIO has been undef'd if FIONREAD is missing. */ > -#ifdef SIGIO > +#if defined (SIGIO) || defined (CYGWIN) > gobble_input (0); > #endif /* SIGIO */ > if (kbd_fetch_ptr != kbd_store_ptr) Likely it is sufficient to move the call of xd_read_queued_messages out of gobble_input: --8<---------------cut here---------------start------------->8--- *** ~/src/emacs-23/src/keyboard.c.~100064~ 2010-09-27 23:18:30.840864838 +0200 --- ~/src/emacs-23/src/keyboard.c 2010-09-27 23:18:01.942112064 +0200 *************** *** 4106,4111 **** --- 4106,4116 ---- /* One way or another, wait until input is available; then, if interrupt handlers have not read it, read it now. */ + #ifdef HAVE_DBUS + /* Read D-Bus messages. */ + xd_read_queued_messages (); + #endif /* HAVE_DBUS */ + /* Note SIGIO has been undef'd if FIONREAD is missing. */ #ifdef SIGIO gobble_input (0); *************** *** 7051,7061 **** gobble_input (expected) int expected; { - #ifdef HAVE_DBUS - /* Read D-Bus messages. */ - xd_read_queued_messages (); - #endif /* HAVE_DBUS */ - #ifdef SIGIO if (interrupt_input) { --- 7056,7061 ---- --8<---------------cut here---------------end--------------->8--- I haven't tested this, 'tho (just being kind of ill). > If this is OK, I have one more question: How do I guarantee that the > patch doesn't propagate to the trunk? Is it enough to say in the log > message that it's for emacs-23 only? I would say yes. > Ken Best regards, Michael.