# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1094144455 0
# Node ID e8bafb4b47dbf497b8cf237743d21f017b3daeb5
# Parent  ca08ff660c736308dcb37e05c792ee7a577d60d4
(x_update_end): Move SetPortWindowPort to inside
BLOCK_INPUT.
(x_set_offset): Use FRAME_MAC_WINDOW.

diff -r ca08ff660c73 -r e8bafb4b47db src/macterm.c
--- a/src/macterm.c	Thu Sep 02 17:00:36 2004 +0000
+++ b/src/macterm.c	Thu Sep 02 17:00:55 2004 +0000
@@ -1325,6 +1325,10 @@
 x_update_end (f)
      struct frame *f;
 {
+  /* Mouse highlight may be displayed again.  */
+  FRAME_MAC_DISPLAY_INFO (f)->mouse_face_defer = 0;
+
+  BLOCK_INPUT;
   /* Reset the background color of Mac OS Window to that of the frame after
      update so that it is used by Mac Toolbox to clear the update region before
      an update event is generated.  */
@@ -1332,10 +1336,6 @@
 
   mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
 
-  /* Mouse highlight may be displayed again.  */
-  FRAME_MAC_DISPLAY_INFO (f)->mouse_face_defer = 0;
-
-  BLOCK_INPUT;
   XFlush (FRAME_MAC_DISPLAY (f));
   UNBLOCK_INPUT;
 }
@@ -5123,7 +5123,7 @@
   modified_left = f->left_pos;
   modified_top = f->top_pos;
 
-  MoveWindow (f->output_data.mac->mWP, modified_left + 6,
+  MoveWindow (FRAME_MAC_WINDOW (f), modified_left + 6,
 	      modified_top + 42, false);
 
   UNBLOCK_INPUT;