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

[Kenichi Handa]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.764 emacs/src/xterm.c:1.765
*** emacs/src/xterm.c:1.764     Sun Nov 17 18:49:32 2002
--- emacs/src/xterm.c   Sun Jan  5 19:45:31 2003
***************
*** 12179,12185 ****
    /* Make sure any errors from previous requests have been dealt with.  */
    XSync (dpy, False);
  
!   record_unwind_protect (x_catch_errors_unwind, x_error_message_string);
  
    x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
    SSET (x_error_message_string, 0, 0);
--- 12179,12187 ----
    /* Make sure any errors from previous requests have been dealt with.  */
    XSync (dpy, False);
  
!   record_unwind_protect (x_catch_errors_unwind,
!                        Fcons (make_save_value (dpy, 0),
!                               x_error_message_string));
  
    x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
    SSET (x_error_message_string, 0, 0);
***************
*** 12193,12199 ****
  x_catch_errors_unwind (old_val)
       Lisp_Object old_val;
  {
!   x_error_message_string = old_val;
    return Qnil;
  }
  
--- 12195,12207 ----
  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;
  }