aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xfns.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d2db6ccebd6..7e270789094 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12014-05-27 Paul Eggert <eggert@cs.ucla.edu> 12014-05-27 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xfns.c (Fx_window_property): Remove unused local.
4
3 Don't kill already-reaped process (Bug#17561). 5 Don't kill already-reaped process (Bug#17561).
4 * process.c (process_send_signal): Fix race condition where a 6 * process.c (process_send_signal): Fix race condition where a
5 subprocess was reaped by a signal handler between the check for 7 subprocess was reaped by a signal handler between the check for
diff --git a/src/xfns.c b/src/xfns.c
index 81496f35bfc..dc3211e4d6b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4652,7 +4652,6 @@ no value of TYPE (always string in the MS Windows case). */)
4652{ 4652{
4653 struct frame *f = decode_window_system_frame (frame); 4653 struct frame *f = decode_window_system_frame (frame);
4654 Atom prop_atom; 4654 Atom prop_atom;
4655 int rc;
4656 Lisp_Object prop_value = Qnil; 4655 Lisp_Object prop_value = Qnil;
4657 Atom target_type = XA_STRING; 4656 Atom target_type = XA_STRING;
4658 Window target_window = FRAME_X_WINDOW (f); 4657 Window target_window = FRAME_X_WINDOW (f);
@@ -4699,7 +4698,7 @@ no value of TYPE (always string in the MS Windows case). */)
4699 vector_ret_p, 4698 vector_ret_p,
4700 &found); 4699 &found);
4701 } 4700 }
4702 4701
4703 4702
4704 unblock_input (); 4703 unblock_input ();
4705 UNGCPRO; 4704 UNGCPRO;