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

[Kim F. Storm]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.165 emacs/src/w32term.c:1.166
*** emacs/src/w32term.c:1.165   Fri Aug 30 08:03:28 2002
--- emacs/src/w32term.c Fri Aug 30 09:19:45 2002
***************
*** 6001,6029 ****
  x_frame_rehighlight (dpyinfo)
       struct w32_display_info *dpyinfo;
  {
!   struct frame *old_highlight = dpyinfo->w32_highlight_frame;
  
    if (dpyinfo->w32_focus_frame)
      {
!       dpyinfo->w32_highlight_frame
        = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
           ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
           : dpyinfo->w32_focus_frame);
!       if (! FRAME_LIVE_P (dpyinfo->w32_highlight_frame))
        {
          FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
!         dpyinfo->w32_highlight_frame = dpyinfo->w32_focus_frame;
        }
      }
    else
!     dpyinfo->w32_highlight_frame = 0;
  
!   if (dpyinfo->w32_highlight_frame != old_highlight)
      {
        if (old_highlight)
        frame_unhighlight (old_highlight);
!       if (dpyinfo->w32_highlight_frame)
!       frame_highlight (dpyinfo->w32_highlight_frame);
      }
  }
  
--- 6001,6029 ----
  x_frame_rehighlight (dpyinfo)
       struct w32_display_info *dpyinfo;
  {
!   struct frame *old_highlight = dpyinfo->x_highlight_frame;
  
    if (dpyinfo->w32_focus_frame)
      {
!       dpyinfo->x_highlight_frame
        = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)))
           ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))
           : dpyinfo->w32_focus_frame);
!       if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame))
        {
          FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil;
!         dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame;
        }
      }
    else
!     dpyinfo->x_highlight_frame = 0;
  
!   if (dpyinfo->x_highlight_frame != old_highlight)
      {
        if (old_highlight)
        frame_unhighlight (old_highlight);
!       if (dpyinfo->x_highlight_frame)
!       frame_highlight (dpyinfo->x_highlight_frame);
      }
  }
  
***************
*** 10757,10764 ****
       struct frame *f;
  {
    /* Don't keep the highlight on an invisible frame.  */
!   if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)
!     FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;
    
    BLOCK_INPUT;
    
--- 10757,10764 ----
       struct frame *f;
  {
    /* Don't keep the highlight on an invisible frame.  */
!   if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
!     FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
    
    BLOCK_INPUT;
    
***************
*** 10786,10793 ****
    Lisp_Object type;
  
    /* Don't keep the highlight on an invisible frame.  */
!   if (FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame == f)
!     FRAME_W32_DISPLAY_INFO (f)->w32_highlight_frame = 0;
  
    if (f->async_iconified)
      return;
--- 10786,10793 ----
    Lisp_Object type;
  
    /* Don't keep the highlight on an invisible frame.  */
!   if (FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame == f)
!     FRAME_W32_DISPLAY_INFO (f)->x_highlight_frame = 0;
  
    if (f->async_iconified)
      return;
***************
*** 10841,10848 ****
      dpyinfo->w32_focus_frame = 0;
    if (f == dpyinfo->w32_focus_event_frame)
      dpyinfo->w32_focus_event_frame = 0;
!   if (f == dpyinfo->w32_highlight_frame)
!     dpyinfo->w32_highlight_frame = 0;
  
    if (f == dpyinfo->mouse_face_mouse_frame)
      {
--- 10841,10848 ----
      dpyinfo->w32_focus_frame = 0;
    if (f == dpyinfo->w32_focus_event_frame)
      dpyinfo->w32_focus_event_frame = 0;
!   if (f == dpyinfo->x_highlight_frame)
!     dpyinfo->x_highlight_frame = 0;
  
    if (f == dpyinfo->mouse_face_mouse_frame)
      {