From e1d0341e25d588120cc58ec9114539afaf74e572 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Mon, 26 Aug 2013 18:00:55 +0400 Subject: [PATCH] * 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. --- src/ChangeLog | 8 ++++++++ src/lisp.h | 6 ++---- src/xdisp.c | 11 +---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a017eaa62f0..a065a91d32b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-08-26 Dmitry Antipov + + * 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 * frame.c (check_minibuf_window): New function. diff --git a/src/lisp.h b/src/lisp.h index ea8b7e3474e..f609727fe27 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2172,10 +2172,8 @@ typedef struct { 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; diff --git a/src/xdisp.c b/src/xdisp.c index cbb70a22bfb..0617a3e6430 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -12384,13 +12384,11 @@ note_tool_bar_highlight (struct frame *f, int x, int y) 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 @@ mouse_face_from_buffer_pos (Lisp_Object window, 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 @@ mouse_face_from_string_pos (struct window *w, Mouse_HLInfo *hlinfo, { 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 @@ mouse_face_from_string_pos (struct window *w, Mouse_HLInfo *hlinfo, { 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 @@ mouse_face_from_string_pos (struct window *w, Mouse_HLInfo *hlinfo, /* 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 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, 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; -- 2.39.2