From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Brown Newsgroups: gmane.emacs.bugs Subject: bug#9754: Issue with Emacs 23.4 Date: Thu, 17 May 2012 08:43:39 -0400 Message-ID: <4FB4F27B.40508@cornell.edu> References: <4FAC34DA.7040606@cs.ucla.edu> <4FB2A9C7.3070604@cornell.edu> <4FB2CFF9.70309@cs.ucla.edu> <4FB2D8AB.7030401@cornell.edu> <878vgsrpoh.fsf@Rainer.invalid> <4FB4DB2D.7040100@cornell.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1337258696 4360 80.91.229.3 (17 May 2012 12:44:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 17 May 2012 12:44:56 +0000 (UTC) Cc: 9754@debbugs.gnu.org, Achim Gratz , Paul Eggert To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 17 14:44:54 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SV04c-0005Nl-Km for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 May 2012 14:44:54 +0200 Original-Received: from localhost ([::1]:34539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SV04b-0001Bx-QL for geb-bug-gnu-emacs@m.gmane.org; Thu, 17 May 2012 08:44:53 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SV04Z-0001Bd-C2 for bug-gnu-emacs@gnu.org; Thu, 17 May 2012 08:44:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SV04X-0007uo-FL for bug-gnu-emacs@gnu.org; Thu, 17 May 2012 08:44:50 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SV04X-0007ug-Bo for bug-gnu-emacs@gnu.org; Thu, 17 May 2012 08:44:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SV04l-0004di-R5 for bug-gnu-emacs@gnu.org; Thu, 17 May 2012 08:45:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ken Brown Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 17 May 2012 12:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9754 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 9754-submit@debbugs.gnu.org id=B9754.133725866617328 (code B ref 9754); Thu, 17 May 2012 12:45:03 +0000 Original-Received: (at 9754) by debbugs.gnu.org; 17 May 2012 12:44:26 +0000 Original-Received: from localhost ([127.0.0.1]:58821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SV047-0004V0-KI for submit@debbugs.gnu.org; Thu, 17 May 2012 08:44:25 -0400 Original-Received: from limestone4.mail.cornell.edu ([128.253.83.164]:61764) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SV043-0004TN-45 for 9754@debbugs.gnu.org; Thu, 17 May 2012 08:44:21 -0400 X-CornellRouted: This message has been Routed already. Original-Received: from orchid.mail.cornell.edu (orchid.mail.cornell.edu [132.236.56.61]) by limestone4.mail.cornell.edu (8.14.4/8.14.4) with ESMTP id q4HChst5020657 for <9754@debbugs.gnu.org>; Thu, 17 May 2012 08:43:54 -0400 (EDT) Original-Received: from authusersmtp.mail.cornell.edu (granite2.mail.cornell.edu [128.253.83.142]) by orchid.mail.cornell.edu (8.14.4/8.14.4) with ESMTP id q4HChtf5015577 for <9754@debbugs.gnu.org>; Thu, 17 May 2012 08:43:55 -0400 (EDT) Original-Received: from [192.168.1.7] (rrcs-208-125-98-102.nys.biz.rr.com [208.125.98.102]) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id q4HChlu9029111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 17 May 2012 08:43:48 -0400 (EDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 In-Reply-To: <4FB4DB2D.7040100@cornell.edu> X-PMX-CORNELL-SPAM-CHECKED: Pawpaw X-PMX-Version: 5.5.9.395186, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.17.100030 X-Original-Sender: kbrown@cornell.edu - Thu May 17 08:43:49 2012 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60122 Archived-At: On 5/17/2012 7:04 AM, Ken Brown wrote: > So maybe the test > > if (inhibit_window_system || !display_arg) > > in my patch should be replaced by > > if (!x_in_use) Here's the patch (against the trunk) that goes along with my suggestion: === modified file 'src/xfns.c' --- src/xfns.c 2012-05-02 10:20:35 +0000 +++ src/xfns.c 2012-05-17 12:29:53 +0000 @@ -136,7 +136,7 @@ /* Nonzero if using X. */ -static int x_in_use; +int x_in_use; static Lisp_Object Qnone; static Lisp_Object Qsuppress_icon; === modified file 'src/xgselect.c' --- src/xgselect.c 2012-05-16 02:22:53 +0000 +++ src/xgselect.c 2012-05-17 12:31:09 +0000 @@ -28,6 +28,8 @@ #include #include +extern int x_in_use; + static GPollFD *gfds; static ptrdiff_t gfds_size; @@ -43,7 +45,7 @@ int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0; int i, nfds, fds_lim, tmo_in_millisec; - if (inhibit_window_system || !display_arg) + if (!x_in_use) return select (max_fds, rfds, wfds, efds, timeout); if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));