(XTread_socket) <PropertyNotify>: Put the code

ignoring events on foreign windows in #if 0.  Always dispatch
the event after checking it with x_handle_property_notify.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b4499c7954bdfd51e8d383f43751e0fac511ff1..599d997b2ef841221df34dbd92237e9010b7f574 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2001-07-12  Gerd Moellmann  <gerd@gnu.org>
+
+       * xselect.c (x_decline_selection_request): Handle errors
+       caused by receivers that have vanished.
+
+       * xterm.c (XTread_socket) <PropertyNotify>: Put the code
+       ignoring events on foreign windows in #if 0.  Always dispatch
+       the event after checking it with x_handle_property_notify.
+
+       * xselect.c (TRACE0, TRACE1, TRACE2): New macros, defined
+       depending on TRACE_SELECTION.  Replace fprintfs in #if 0 with 
+       TRACE macros to facilitate debugging.  Add additional trace
+       statements.
+       (toplevel): Add prototypes for file-local functions.
+       (x_atom_to_symbol): Remove DPYINFO parameter.
+
 2001-07-11  Stefan Monnier  <monnier@cs.yale.edu>
 
        * w32menu.c (menubar_selection_callback, w32_menu_show):

diff --git a/src/xterm.c b/src/xterm.c
index 5991d3e1223da6ecb99606c03f56cb882ed6387f..7061d549607bab6c68ee8940a0c5e7f7cbc9e81a 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9997,7 +9997,8 @@ XTread_socket (sd, bufp, numchars, expected)
                               &event);
              else
                {
-                 XSelectionRequestEvent *eventp = (XSelectionRequestEvent *) &event;
+                 XSelectionRequestEvent *eventp
+                   = (XSelectionRequestEvent *) &event;
 
                  if (numchars == 0)
                    abort ();
@@ -10019,12 +10020,16 @@ XTread_socket (sd, bufp, numchars, expected)
              break;
 
            case PropertyNotify:
-#ifdef USE_X_TOOLKIT
+#if 0 /* This is plain wrong.  In the case that we are waiting for a
+        PropertyNotify used as an ACK in incremental selection
+        transfer, the property will be on the receiver's window.  */
+#if defined USE_X_TOOLKIT
              if (!x_any_window_to_frame (dpyinfo, event.xproperty.window))
                goto OTHER;
-#endif /* not USE_X_TOOLKIT */
+#endif
+#endif
              x_handle_property_notify (&event.xproperty);
-             break;
+             goto OTHER;
 
            case ReparentNotify:
              f = x_top_window_to_frame (dpyinfo, event.xreparent.window);