[Emacs-diffs] trunk r114007: * lisp.h (Mouse_HLInfo): Drop set-but-unused members

[Dmitry Antipov]

------------------------------------------------------------
revno: 114007
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-26 18:00:55 +0400
message:
  * lisp.h (Mouse_HLInfo): Drop set-but-unused members
  mouse_face_beg_y and mouse_face_end_y.
  * xdisp.c (note_tool_bar_highlight, mouse_face_from_buffer_pos)
  (mouse_face_from_string_pos, note_mode_line_or_margin_highlight):
  Adjust users and update comment where appropriate.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-26 12:39:08 +0000
+++ b/src/ChangeLog     2013-08-26 14:00:55 +0000
@@ -1,3 +1,11 @@
+2013-08-26  Dmitry Antipov  <address@hidden>
+
+       * lisp.h (Mouse_HLInfo): Drop set-but-unused members
+       mouse_face_beg_y and mouse_face_end_y.
+       * xdisp.c (note_tool_bar_highlight, mouse_face_from_buffer_pos)
+       (mouse_face_from_string_pos, note_mode_line_or_margin_highlight):
+       Adjust users and update comment where appropriate.
+
 2013-08-26  Martin Rudalics  <address@hidden>
 
        * frame.c (check_minibuf_window): New function.

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-08-22 18:29:51 +0000
+++ b/src/lisp.h        2013-08-26 14:00:55 +0000
@@ -2172,10 +2172,8 @@
      the mouse stays within this range, we need not redraw anything on
      its account.  Rows and columns are glyph matrix positions in
      MOUSE_FACE_WINDOW.  */
-  int mouse_face_beg_row, mouse_face_beg_col;
-  int mouse_face_beg_x, mouse_face_beg_y;
-  int mouse_face_end_row, mouse_face_end_col;
-  int mouse_face_end_x, mouse_face_end_y;
+  int mouse_face_beg_row, mouse_face_beg_col, mouse_face_beg_x;
+  int mouse_face_end_row, mouse_face_end_col, mouse_face_end_x;
   Lisp_Object mouse_face_window;
   int mouse_face_face_id;
   Lisp_Object mouse_face_overlay;

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-26 09:33:37 +0000
+++ b/src/xdisp.c       2013-08-26 14:00:55 +0000
@@ -12384,13 +12384,11 @@
       hlinfo->mouse_face_beg_col = hpos;
       hlinfo->mouse_face_beg_row = vpos;
       hlinfo->mouse_face_beg_x = x;
-      hlinfo->mouse_face_beg_y = row->y;
       hlinfo->mouse_face_past_end = 0;
 
       hlinfo->mouse_face_end_col = hpos + 1;
       hlinfo->mouse_face_end_row = vpos;
       hlinfo->mouse_face_end_x = x + glyph->pixel_width;
-      hlinfo->mouse_face_end_y = row->y;
       hlinfo->mouse_face_window = window;
       hlinfo->mouse_face_face_id = TOOL_BAR_FACE_ID;
 
@@ -27113,9 +27111,7 @@
       r1 = tem;
     }
 
-  hlinfo->mouse_face_beg_y = r1->y;
   hlinfo->mouse_face_beg_row = MATRIX_ROW_VPOS (r1, w->current_matrix);
-  hlinfo->mouse_face_end_y = r2->y;
   hlinfo->mouse_face_end_row = MATRIX_ROW_VPOS (r2, w->current_matrix);
 
   /* For a bidi-reordered row, the positions of BEFORE_STRING,
@@ -27479,7 +27475,6 @@
              {
                hlinfo->mouse_face_beg_row
                  = MATRIX_ROW_VPOS (r, w->current_matrix);
-               hlinfo->mouse_face_beg_y = r->y;
                hlinfo->mouse_face_beg_col = g - r->glyphs[TEXT_AREA];
                hlinfo->mouse_face_beg_x = gx;
                found = 1;
@@ -27498,7 +27493,6 @@
              {
                hlinfo->mouse_face_beg_row
                  = MATRIX_ROW_VPOS (r, w->current_matrix);
-               hlinfo->mouse_face_beg_y = r->y;
                hlinfo->mouse_face_beg_col = g - r->glyphs[TEXT_AREA];
                for (gx = r->x, g1 = r->glyphs[TEXT_AREA]; g1 < g; ++g1)
                  gx += g1->pixel_width;
@@ -27535,9 +27529,8 @@
   /* The highlighted region ends on the previous row.  */
   r--;
 
-  /* Set the end row and its vertical pixel coordinate.  */
+  /* Set the end row.  */
   hlinfo->mouse_face_end_row = MATRIX_ROW_VPOS (r, w->current_matrix);
-  hlinfo->mouse_face_end_y = r->y;
 
   /* Compute and set the end column and the end column's horizontal
      pixel coordinate.  */
@@ -28035,8 +28028,6 @@
 
          hlinfo->mouse_face_beg_row  = vpos;
          hlinfo->mouse_face_end_row  = hlinfo->mouse_face_beg_row;
-         hlinfo->mouse_face_beg_y    = 0;
-         hlinfo->mouse_face_end_y    = 0;
          hlinfo->mouse_face_past_end = 0;
          hlinfo->mouse_face_window   = window;