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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1060 emacs/src/xdisp.c:1.1061
*** emacs/src/xdisp.c:1.1060    Wed Oct 12 09:50:06 2005
--- emacs/src/xdisp.c   Thu Oct 13 22:41:40 2005
***************
*** 1348,1354 ****
    current_header_line_height = current_mode_line_height = -1;
  
    if (visible_p && XFASTINT (w->hscroll) > 0)
!     *x -= XFASTINT (w->hscroll);
  
    return visible_p;
  }
--- 1348,1354 ----
    current_header_line_height = current_mode_line_height = -1;
  
    if (visible_p && XFASTINT (w->hscroll) > 0)
!     *x -= XFASTINT (w->hscroll) * WINDOW_FRAME_COLUMN_WIDTH (w);
  
    return visible_p;
  }
***************
*** 2112,2118 ****
              break;
  
          if (g < end)
!           width = g->pixel_width;
          else
            {
              /* Use nominal char spacing at end of line.  */
--- 2112,2127 ----
              break;
  
          if (g < end)
!           {
!             if (g->type == IMAGE_GLYPH)
!               {
!                 /* Don't remember when mouse is over image, as
!                    image may have hot-spots.  */
!                 STORE_NATIVE_RECT (*rect, 0, 0, 0, 0);
!                 return;
!               }
!             width = g->pixel_width;
!           }
          else
            {
              /* Use nominal char spacing at end of line.  */