[Emacs-diffs] Changes to emacs/src/xterm.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.804.2.12 emacs/src/xterm.c:1.804.2.13
*** emacs/src/xterm.c:1.804.2.12        Tue Jul  6 02:57:15 2004
--- emacs/src/xterm.c   Fri Aug 27 07:00:34 2004
***************
*** 6180,6186 ****
        f = x_top_window_to_frame (dpyinfo, event.xmap.window);
        if (f)
          {
!           /* wait_reading_process_input will notice this and update
               the frame's display structures.
               If we where iconified, we should not set garbaged,
               because that stops redrawing on Expose events.  This looks
--- 6180,6186 ----
        f = x_top_window_to_frame (dpyinfo, event.xmap.window);
        if (f)
          {
!           /* wait_reading_process_output will notice this and update
               the frame's display structures.
               If we where iconified, we should not set garbaged,
               because that stops redrawing on Expose events.  This looks
***************
*** 7611,7621 ****
  x_catch_errors_unwind (old_val)
       Lisp_Object old_val;
  {
!   Lisp_Object first;
  
!   first = XCAR (old_val);
! 
!   XSync (XSAVE_VALUE (first)->pointer, False);
  
    x_error_message_string = XCDR (old_val);
    return Qnil;
--- 7611,7623 ----
  x_catch_errors_unwind (old_val)
       Lisp_Object old_val;
  {
!   Lisp_Object first = XCAR (old_val);
!   Display *dpy = XSAVE_VALUE (first)->pointer;
  
!   /* The display may have been closed before this function is called.
!      Check if it is still open before calling XSync.  */
!   if (x_display_info_for_display (dpy) != 0)
!     XSync (dpy, False);
  
    x_error_message_string = XCDR (old_val);
    return Qnil;