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

[Richard M. Stallman]

Index: emacs/src/xterm.c
diff -u emacs/src/xterm.c:1.679 emacs/src/xterm.c:1.680
--- emacs/src/xterm.c:1.679     Sun Nov  4 19:14:12 2001
+++ emacs/src/xterm.c   Mon Nov 12 00:35:02 2001
@@ -10669,6 +10669,7 @@
              {
                f = x_any_window_to_frame (dpyinfo, event.xcrossing.window);
 
+#if 0
                if (event.xcrossing.focus)
                  {
                    /* Avoid nasty pop/raise loops.  */
@@ -10682,7 +10683,8 @@
                  }
                else if (f == dpyinfo->x_focus_frame)
                  x_new_focus_frame (dpyinfo, 0);
-             
+#endif
+
                /* EnterNotify counts as mouse movement,
                   so update things that depend on mouse position.  */
                if (f && !f->output_data.x->hourglass_p)
@@ -10746,15 +10748,18 @@
                      bufp += n, count += n, numchars -= n;
                    }
 
+#if 0
                  if (event.xcrossing.focus)
                    x_mouse_leave (dpyinfo);
                  else
                    {
                      if (f == dpyinfo->x_focus_event_frame)
                        dpyinfo->x_focus_event_frame = 0;
-                     if (f == dpyinfo->x_focus_frame)
+                     if (dpyinfo->x_focus_event_frame != 0
+                         && f == dpyinfo->x_focus_frame)
                        x_new_focus_frame (dpyinfo, 0);
                    }
+#endif
                }
              goto OTHER;
 
@@ -11516,7 +11521,7 @@
       if (f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame
          || w != XWINDOW (f->selected_window))
        {
-         if (MINI_WINDOW_P (w)
+         if ((MINI_WINDOW_P (w) && minibuf_level == 0)
              || !cursor_non_selected
              || NILP (XBUFFER (w->buffer)->cursor_type))
            new_cursor_type = NO_CURSOR;