* macterm.c (XTread_socket) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:

Undo 2006-09-08 change.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fea9f668224..67796c36985 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (mac_window) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+        * macterm.c (XTread_socket) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
+        Undo 2006-09-08 change.
+
 2006-09-11  Chong Yidong  <cyd@stupidchicken.com>
 
         * keymap.c (Fkey_binding): Use string position for string objects.
@@ -29,14 +35,14 @@
 
 2006-09-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * mac.c [MAC_OSX] (sys_select): Check argument `nfds' more
-        rigidly.  Make variable `ofds' static.  Remove variable `maxfd'.
+        * mac.c [MAC_OSX] (sys_select): Check argument `nfds' more rigidly.
+        Make variable `ofds' static.  Remove variable `maxfd'.
 
         * macfns.c (Fx_file_dialog): Remove unused variable `f'.  Call
         check_mac.
 
-        * macmenu.c (Vmenu_updating_frame, syms_of_xmenu):
-        * w32menu.c (Vmenu_updating_frame, syms_of_xmenu): Apply
+        * macmenu.c (Vmenu_updating_frame, syms_of_macmenu):
+        * w32menu.c (Vmenu_updating_frame, syms_of_w32menu): Apply
         2006-09-08 change for xmenu.c.
 
         * xfns.c (Fx_file_dialog): Call check_x.
diff --git a/src/macterm.c b/src/macterm.c
index 98c311ff02e..5b1bda42891 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10538,11 +10538,7 @@ XTread_socket (sd, expected, hold_quit)
                     && (TrackWindowProxyDrag (window_ptr, er.where)
                         != errUserWantsToDragWindow))
                   break;
-                /* kWindowAsyncDragAttribute is specified on Mac OS X
-                   10.3 and later.*/
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
                 DragWindow (window_ptr, er.where, NULL);
-#endif
 #else /* not TARGET_API_MAC_CARBON */
                 DragWindow (window_ptr, er.where, &qd.screenBits.bounds);
 #endif /* not TARGET_API_MAC_CARBON */