From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Jan D." Newsgroups: gmane.emacs.bugs Subject: bug#19175: 24.4; make-frame-on-display fails if emacs started with -nw Date: Sun, 29 Mar 2015 21:18:06 +0200 Message-ID: <5B364DE3-7FCC-415D-9AA9-CF96107BD44F@swipnet.se> 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> <83iodjzpn8.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427656769 23696 80.91.229.3 (29 Mar 2015 19:19:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 29 Mar 2015 19:19:29 +0000 (UTC) Cc: Mario Becroft , 19175-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 29 21:19:14 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 1YcIjp-0007m3-59 for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Mar 2015 21:19:13 +0200 Original-Received: from localhost ([::1]:57984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcIjo-0000xR-Fu for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Mar 2015 15:19:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcIjk-0000uA-HU for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 15:19:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcIjf-0003te-1p for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 15:19:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcIje-0003tU-V5 for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 15:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YcIje-0005Af-IX for bug-gnu-emacs@gnu.org; Sun, 29 Mar 2015 15:19:02 -0400 Resent-From: "Jan D." Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Mar 2015 19:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 19175 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Mail-Followup-To: 19175@debbugs.gnu.org, jan.h.d@swipnet.se, mb@becroft.co.nz Original-Received: via spool by 19175-done@debbugs.gnu.org id=D19175.142765669919822 (code D ref 19175); Sun, 29 Mar 2015 19:19:02 +0000 Original-Received: (at 19175-done) by debbugs.gnu.org; 29 Mar 2015 19:18:19 +0000 Original-Received: from localhost ([127.0.0.1]:39820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YcIiw-00059d-Ee for submit@debbugs.gnu.org; Sun, 29 Mar 2015 15:18:18 -0400 Original-Received: from mailfe01.swip.net ([212.247.154.1]:43369 helo=swip.net) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YcIit-00059O-GC for 19175-done@debbugs.gnu.org; Sun, 29 Mar 2015 15:18:16 -0400 X-T2-Spam-Status: No, hits=-0.0 required=5.0 tests=BAYES_40 Original-Received: from hosdjarv.se (account mj138573@tele2.se [46.59.42.57] verified) by mailfe01.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 570195373; Sun, 29 Mar 2015 21:18:07 +0200 In-Reply-To: <83iodjzpn8.fsf@gnu.org> X-Mailer: Apple Mail (2.2070.6) 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:101029 Archived-At: Fixed in the emacs-24 branch. Jan D. > 29 mar 2015 kl. 19:20 skrev Eli Zaretskii : >=20 >> Date: Sun, 29 Mar 2015 19:09:48 +0200 >> From: Jan Dj=E4rv >> CC: mb@becroft.co.nz, 19175@debbugs.gnu.org >>=20 >> 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; >>=20 >> + unrequest_sigio (); >> gdpy =3D gdk_display_open (display_name); >> + request_sigio (); >> if (!gdpy_def && gdpy) >> { >> gdpy_def =3D 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=20 >> *offset) >> bool >> x_display_ok (const char *display) >> { >> - Display *dpy =3D XOpenDisplay (display); >> + Display *dpy; >> + unrequest_sigio (); >> + dpy =3D XOpenDisplay (display); >> + request_sigio (); >> return dpy ? (XCloseDisplay (dpy), 1) : 0; >> } >>=20 >> @@ -9811,7 +9814,9 @@ x_term_init (Lisp_Object display_name, char = *xrm_option,=20 >> char *resource_name) >>=20 >> /* gtk_init does set_locale. Fix locale before and after. = */ >> fixup_locale (); >> + unrequest_sigio (); >> gtk_init (&argc, &argv2); >> + request_sigio (); >> fixup_locale (); >>=20 >> g_log_remove_handler ("GLib", id); >> @@ -9861,10 +9866,12 @@ x_term_init (Lisp_Object display_name, char=20= >> *xrm_option, char *resource_name) >> argv[argc++] =3D xrm_option; >> } >> turn_on_atimers (0); >> + unrequest_sigio (); >> dpy =3D XtOpenDisplay (Xt_app_con, SSDATA (display_name), >> resource_name, EMACS_CLASS, >> emacs_options, XtNumber (emacs_options), >> &argc, argv); >> + request_sigio (); >> turn_on_atimers (1); >>=20 >> #ifdef HAVE_X11XTR6 >> @@ -9875,7 +9882,9 @@ x_term_init (Lisp_Object display_name, char = *xrm_option,=20 >> char *resource_name) >>=20 >> #else /* not USE_X_TOOLKIT */ >> XSetLocaleModifiers (""); >> + unrequest_sigio (); >> dpy =3D XOpenDisplay (SSDATA (display_name)); >> + request_sigio (); >> #endif /* not USE_X_TOOLKIT */ >> #endif /* not USE_GTK*/ >=20 > Thanks, this looks safe enough to me. Just add some comments to > explain the need. >=20 > I hope Nicolas won't mind preparing a new tarball for the release.