From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#19175: 24.4; make-frame-on-display fails if emacs started with -nw Date: Sun, 29 Mar 2015 20:20:43 +0300 Message-ID: <83iodjzpn8.fsf@gnu.org> References: <87wq6jrjis.fsf@ak2.becroft.co.nz> <0E7A721E-2256-4932-9832-ED19A86FE000@swipnet.se> <87bnjc5v0r.fsf@ak2.becroft.co.nz> <9800C187-E0D5-4431-865C-7CD57D019D6B@swipnet.se> <83r3s7zw2i.fsf@gnu.org> <551831DC.6010406@swipnet.se> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8BIT X-Trace: ger.gmane.org 1427649748 12798 80.91.229.3 (29 Mar 2015 17:22:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 29 Mar 2015 17:22:28 +0000 (UTC) Cc: mb@becroft.co.nz, 19175@debbugs.gnu.org To: Jan =?UTF-8?Q?Dj=C3=A4rv?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 29 19:22:13 2015 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 1YcGuY-00055r-R5 for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Mar 2015 19:22:10 +0200 Original-Received: from localhost ([::1]:57700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcGuY-0004kG-4u for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Mar 2015 13:22:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcGuU-0004k0-29 for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 13:22:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcGuQ-00022l-N5 for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 13:22:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcGuQ-00022d-Kh for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 13:22:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YcGuQ-0002RW-3n for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 13:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Mar 2015 17:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19175 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 19175-submit@debbugs.gnu.org id=B19175.14276496709325 (code B ref 19175); Sun, 29 Mar 2015 17:22:02 +0000 Original-Received: (at 19175) by debbugs.gnu.org; 29 Mar 2015 17:21:10 +0000 Original-Received: from localhost ([127.0.0.1]:39789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YcGtZ-0002QK-PP for submit@debbugs.gnu.org; Sun, 29 Mar 2015 13:21:10 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:44470) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YcGtW-0002Pa-Me for 19175@debbugs.gnu.org; Sun, 29 Mar 2015 13:21:07 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NLZ00F00HIOXT00@a-mtaout20.012.net.il> for 19175@debbugs.gnu.org; Sun, 29 Mar 2015 20:21:00 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NLZ00F9HHIZTX40@a-mtaout20.012.net.il>; Sun, 29 Mar 2015 20:21:00 +0300 (IDT) In-reply-to: <551831DC.6010406@swipnet.se> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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:101025 Archived-At: > Date: Sun, 29 Mar 2015 19:09:48 +0200 > From: Jan Djärv > CC: mb@becroft.co.nz, 19175@debbugs.gnu.org > > index fedaa0f..1f48262 100644 > --- a/src/gtkutil.c > +++ b/src/gtkutil.c > @@ -167,7 +167,9 @@ xg_display_open (char *display_name, Display **dpy) > { > GdkDisplay *gdpy; > > + unrequest_sigio (); > gdpy = gdk_display_open (display_name); > + request_sigio (); > if (!gdpy_def && gdpy) > { > gdpy_def = gdpy; > diff --git a/src/xterm.c b/src/xterm.c > index 4ca1e13..8284ed9 100644 > --- a/src/xterm.c > +++ b/src/xterm.c > @@ -9719,7 +9719,10 @@ get_bits_and_offset (unsigned long mask, int *bits, int > *offset) > bool > x_display_ok (const char *display) > { > - Display *dpy = XOpenDisplay (display); > + Display *dpy; > + unrequest_sigio (); > + dpy = XOpenDisplay (display); > + request_sigio (); > return dpy ? (XCloseDisplay (dpy), 1) : 0; > } > > @@ -9811,7 +9814,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, > char *resource_name) > > /* gtk_init does set_locale. Fix locale before and after. */ > fixup_locale (); > + unrequest_sigio (); > gtk_init (&argc, &argv2); > + request_sigio (); > fixup_locale (); > > g_log_remove_handler ("GLib", id); > @@ -9861,10 +9866,12 @@ x_term_init (Lisp_Object display_name, char > *xrm_option, char *resource_name) > argv[argc++] = xrm_option; > } > turn_on_atimers (0); > + unrequest_sigio (); > dpy = XtOpenDisplay (Xt_app_con, SSDATA (display_name), > resource_name, EMACS_CLASS, > emacs_options, XtNumber (emacs_options), > &argc, argv); > + request_sigio (); > turn_on_atimers (1); > > #ifdef HAVE_X11XTR6 > @@ -9875,7 +9882,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, > char *resource_name) > > #else /* not USE_X_TOOLKIT */ > XSetLocaleModifiers (""); > + unrequest_sigio (); > dpy = XOpenDisplay (SSDATA (display_name)); > + request_sigio (); > #endif /* not USE_X_TOOLKIT */ > #endif /* not USE_GTK*/ Thanks, this looks safe enough to me. Just add some comments to explain the need. I hope Nicolas won't mind preparing a new tarball for the release.