Bring up to date with xterm.c changes of 2000-02-24 and 2000-02-25.

2 files changed, 22 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fb95e324f34..e3729fb0aa3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-03-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c: Equivalent changes to those made to xterm.c on
+        2000-02-25 and 2000-02-24.
+
+        * w32fns.c: Equivalent changes to those made to xfns.c on
+        2000-02-25 and 2000-02-21.
+
+        * sysdep.c: [WINDOWSNT]: Use sys_read and sys_write to ensure
+        correct line-end convention is followed.
+
+        * w32menu.c [HAVE_BOXES]: Remove #undef.
+        (single_keymap_panes): Remove code for simulating checkmarks.
+        (single_menu_item): Remove notbuttons_ptr argument. Callers changed.
+        Remove code for drawing simulated checkmarks.
+        (w32_menu_show): make unibyte help string correctly.
+        (add_menu_item): draw standard Windows checkmarks. Draw radio
+        buttons as radio buttons if possible.
+
 2000-03-01  Gerd Moellmann  <gerd@gnu.org>
 
         * sysdep.c (start_of_text): Don't define this function for NetBSD
diff --git a/src/w32term.c b/src/w32term.c
index f59f80e9482..6b1fabcd541 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -171,7 +171,6 @@ int x_stretch_cursor_p;
 #define CP_DEFAULT 1004
 
 extern unsigned int msh_mousewheel;
-extern int inhibit_busy_cursor;
 
 extern void free_frame_menubar ();
 
@@ -7739,9 +7738,6 @@ w32_read_socket (sd, bufp, numchars, expected)
               bufp++;
               numchars--;
               count++;
-              if (display_busy_cursor_p)
-                if (bufp->code != VK_RETURN || minibuf_level == 0)
-                  inhibit_busy_cursor = 2;
             }
           break;
 
@@ -7762,9 +7758,6 @@ w32_read_socket (sd, bufp, numchars, expected)
               bufp++;
               numchars--;
               count++;
-              if (display_busy_cursor_p)
-                if (bufp->code != VK_RETURN || minibuf_level == 0)
-                  inhibit_busy_cursor = 2;
             }
           break;
 
@@ -7882,8 +7875,6 @@ w32_read_socket (sd, bufp, numchars, expected)
 
                 if (!tool_bar_p)
                   last_tool_bar_item = -1;
-                if (display_busy_cursor_p)
-                  inhibit_busy_cursor = 2;
               }
             break;
           }
@@ -8631,7 +8622,9 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y)
       if (w != XWINDOW (selected_window)
           || f != FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame)
         {
-          if (MINI_WINDOW_P (w))
+          extern int cursor_in_non_selected_windows;
+
+          if (MINI_WINDOW_P (w) || !cursor_in_non_selected_windows)
             new_cursor_type = NO_CURSOR;
           else
             new_cursor_type = HOLLOW_BOX_CURSOR;