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

[Masatake YAMATO]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1022 emacs/src/xdisp.c:1.1023
*** emacs/src/xdisp.c:1.1022    Wed Jun  8 22:33:35 2005
--- emacs/src/xdisp.c   Fri Jun 10 05:31:44 2005
***************
*** 21523,21529 ****
          int ignore;
  
          int vpos, hpos;
!         
          b = Fprevious_single_property_change (make_number (charpos + 1),
                                                Qmouse_face, string, Qnil);
          if (NILP (b))
--- 21523,21529 ----
          int ignore;
  
          int vpos, hpos;
! 
          b = Fprevious_single_property_change (make_number (charpos + 1),
                                                Qmouse_face, string, Qnil);
          if (NILP (b))
***************
*** 21571,21577 ****
          hpos = (area == ON_MODE_LINE
                  ? (w->current_matrix)->nrows - 1
                  : 0);
!         
          /* If the re-rendering position is included in the last
             re-rendering area, we should do nothing. */
          if ( window == dpyinfo->mouse_face_window
--- 21571,21577 ----
          hpos = (area == ON_MODE_LINE
                  ? (w->current_matrix)->nrows - 1
                  : 0);
! 
          /* If the re-rendering position is included in the last
             re-rendering area, we should do nothing. */
          if ( window == dpyinfo->mouse_face_window
***************
*** 21579,21588 ****
               && vpos < dpyinfo->mouse_face_end_col
               && dpyinfo->mouse_face_beg_row == hpos )
            return;
!         
          if (clear_mouse_face (dpyinfo))
            cursor = No_Cursor;
!         
          dpyinfo->mouse_face_beg_col = vpos;
          dpyinfo->mouse_face_beg_row = hpos;
  
--- 21579,21588 ----
               && vpos < dpyinfo->mouse_face_end_col
               && dpyinfo->mouse_face_beg_row == hpos )
            return;
! 
          if (clear_mouse_face (dpyinfo))
            cursor = No_Cursor;
! 
          dpyinfo->mouse_face_beg_col = vpos;
          dpyinfo->mouse_face_beg_row = hpos;
  
***************
*** 21607,21614 ****
          if (NILP (pointer))
            pointer = Qhand;
        }
      }
- 
    define_frame_cursor1 (f, cursor, pointer);
  }
  
--- 21607,21615 ----
          if (NILP (pointer))
            pointer = Qhand;
        }
+       else if ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE))
+       clear_mouse_face (dpyinfo);
      }
    define_frame_cursor1 (f, cursor, pointer);
  }