/[emacs]/emacs/src/xterm.c
ViewVC logotype

Diff of /emacs/src/xterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.650.4.14 by gerd, Thu Nov 1 11:30:57 2001 UTC revision 1.650.4.15 by rms, Mon Nov 12 22:53:49 2001 UTC
# Line 10654  XTread_socket (sd, bufp, numchars, expec Line 10654  XTread_socket (sd, bufp, numchars, expec
10654                {                {
10655                  f = x_any_window_to_frame (dpyinfo, event.xcrossing.window);                  f = x_any_window_to_frame (dpyinfo, event.xcrossing.window);
10656    
10657    #if 0
10658                  if (event.xcrossing.focus)                  if (event.xcrossing.focus)
10659                    {                    {
10660                      /* Avoid nasty pop/raise loops.  */                      /* Avoid nasty pop/raise loops.  */
# Line 10667  XTread_socket (sd, bufp, numchars, expec Line 10668  XTread_socket (sd, bufp, numchars, expec
10668                    }                    }
10669                  else if (f == dpyinfo->x_focus_frame)                  else if (f == dpyinfo->x_focus_frame)
10670                    x_new_focus_frame (dpyinfo, 0);                    x_new_focus_frame (dpyinfo, 0);
10671                  #endif
10672    
10673                  /* EnterNotify counts as mouse movement,                  /* EnterNotify counts as mouse movement,
10674                     so update things that depend on mouse position.  */                     so update things that depend on mouse position.  */
10675                  if (f && !f->output_data.x->hourglass_p)                  if (f && !f->output_data.x->hourglass_p)
# Line 10731  XTread_socket (sd, bufp, numchars, expec Line 10733  XTread_socket (sd, bufp, numchars, expec
10733                        bufp += n, count += n, numchars -= n;                        bufp += n, count += n, numchars -= n;
10734                      }                      }
10735    
10736    #if 0
10737                    if (event.xcrossing.focus)                    if (event.xcrossing.focus)
10738                      x_mouse_leave (dpyinfo);                      x_mouse_leave (dpyinfo);
10739                    else                    else
# Line 10740  XTread_socket (sd, bufp, numchars, expec Line 10743  XTread_socket (sd, bufp, numchars, expec
10743                        if (f == dpyinfo->x_focus_frame)                        if (f == dpyinfo->x_focus_frame)
10744                          x_new_focus_frame (dpyinfo, 0);                          x_new_focus_frame (dpyinfo, 0);
10745                      }                      }
10746    #endif
10747                  }                  }
10748                goto OTHER;                goto OTHER;
10749    
# Line 11501  x_display_and_set_cursor (w, on, hpos, v Line 11505  x_display_and_set_cursor (w, on, hpos, v
11505          {          {
11506            extern int cursor_in_non_selected_windows;            extern int cursor_in_non_selected_windows;
11507                        
11508            if (MINI_WINDOW_P (w)            if ((MINI_WINDOW_P (w) && minibuf_level == 0)
11509                || !cursor_in_non_selected_windows                || !cursor_in_non_selected_windows
11510                || NILP (XBUFFER (w->buffer)->cursor_type))                || NILP (XBUFFER (w->buffer)->cursor_type))
11511              new_cursor_type = NO_CURSOR;              new_cursor_type = NO_CURSOR;

Legend:
Removed from v.1.650.4.14  
changed lines
  Added in v.1.650.4.15

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26