From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 Mar 2015 21:24:19 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~42
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d16fb740912bf4874e7087f6f419427516047977

Merge from origin/emacs-24

4d2e7e1 Fixes: debbugs:19175
2e0cfcc Fix the preamble text of the DIR file we install  (Bug#20213)
22ece83 src/w32proc.c: Describe in a comment w32 subprocess implementation.

Conflicts:
	ChangeLog
	src/ChangeLog
	src/xterm.c
---

d16fb740912bf4874e7087f6f419427516047977
diff --cc ChangeLog
index f550c6d9c6,9019b55694..f45e32fbc2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,16 @@@
+ 2015-03-29  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* build-aux/dir_top (File): Fix the description of selecting a
+ 	menu item by its number.  (Bug#20213)
+ 
 -2015-04-01  Nicolas Petton  <nicolas@petton.fr>
 +2015-03-29  Paul Eggert  <eggert@cs.ucla.edu>
  
 -	* Version 24.5 released.
 +	Fix 'commit-msg' to cite 'CONTRIBUTE'
 +	As suggested in:
 +	http://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00947.html
 +	Also, have the two files match better.
 +	* CONTRIBUTE: Match what's in build-aux/git-hooks/commit-msg.
 +	* build-aux/git-hooks/commit-msg: Mention 'CONTRIBUTE'.
  
  2015-03-23  Andreas Schwab  <schwab@suse.de>
  
diff --cc src/ChangeLog
index c11ecb7e3a,39b3c9fc4c..f0ed9e7474
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,4 -1,14 +1,10 @@@
+ 2015-03-29  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+ 	* gtkutil.c (xg_display_open):
+ 	* xterm.c (x_display_ok, x_term_init): Block SIGIO when opening
+ 	a display (Bug#19175).
+ 
 -2015-04-01  Nicolas Petton  <nicolas@petton.fr>
 -
 -	* Version 24.5 released.
 -
 -2015-03-25  Martin Rudalics  <rudalics@gmx.at>
 +2015-03-29  Martin Rudalics  <rudalics@gmx.at>
  
  	* gtkutil.c (update_theme_scrollbar_width): Don't round up
  	scroll bar width with GTK3 (Bug#20182).
diff --cc src/xterm.c
index 03c081179a,2ac2fe84e5..bdc85ae71f
--- a/src/xterm.c
+++ b/src/xterm.c
@@@ -10684,11 -9719,12 +10684,14 @@@ get_bits_and_offset (unsigned long mask
  bool
  x_display_ok (const char *display)
  {
 -  Display *dpy;
 -  // XOpenDisplay fails if it gets a signal.  Block SIGIO which may arrive.
++  /* XOpenDisplay fails if it gets a signal.  Block SIGIO which may arrive.  */
+   unrequest_sigio ();
 -  dpy = XOpenDisplay (display);
 +  Display *dpy = XOpenDisplay (display);
+   request_sigio ();
 -  return dpy ? (XCloseDisplay (dpy), 1) : 0;
 +  if (!dpy)
 +    return false;
 +  XCloseDisplay (dpy);
 +  return true;
  }
  
  #ifdef USE_GTK
@@@ -10864,7 -9815,9 +10867,9 @@@ x_term_init (Lisp_Object display_name, 
  
          /* gtk_init does set_locale.  Fix locale before and after.  */
          fixup_locale ();
 -        unrequest_sigio (); // See comment in x_display_ok.
++        unrequest_sigio (); /* See comment in x_display_ok.  */
          gtk_init (&argc, &argv2);
+         request_sigio ();
          fixup_locale ();
  
          g_log_remove_handler ("GLib", id);
@@@ -10913,12 -9866,14 +10918,14 @@@
  	argv[argc++] = "-xrm";
  	argv[argc++] = xrm_option;
        }
 -    turn_on_atimers (0);
 -    unrequest_sigio ();  // See comment in x_display_ok.
 +    turn_on_atimers (false);
++    unrequest_sigio ();  /* See comment in x_display_ok.  */
      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);
 +    turn_on_atimers (true);
  
  #ifdef HAVE_X11XTR6
      /* I think this is to compensate for XtSetLanguageProc.  */