aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 8d379536062..53d881072ce 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21263,9 +21263,9 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21263 string = mode_line_string (w, area, &x, &y, &charpos, 21263 string = mode_line_string (w, area, &x, &y, &charpos,
21264 &object, &dx, &dy, &width, &height); 21264 &object, &dx, &dy, &width, &height);
21265 21265
21266 row = (area == ON_MODE_LINE)? 21266 row = (area == ON_MODE_LINE
21267 MATRIX_MODE_LINE_ROW (w->current_matrix): 21267 ? MATRIX_MODE_LINE_ROW (w->current_matrix)
21268 MATRIX_HEADER_LINE_ROW(w->current_matrix); 21268 : MATRIX_HEADER_LINE_ROW (w->current_matrix));
21269 21269
21270 /* Find glyph */ 21270 /* Find glyph */
21271 if (row->mode_line_p && row->enabled_p) 21271 if (row->mode_line_p && row->enabled_p)
@@ -21379,8 +21379,8 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21379 if (clear_mouse_face (dpyinfo)) 21379 if (clear_mouse_face (dpyinfo))
21380 cursor = No_Cursor; 21380 cursor = No_Cursor;
21381 21381
21382 b = Fprevious_single_property_change(make_number (charpos + 1), 21382 b = Fprevious_single_property_change (make_number (charpos + 1),
21383 Qmouse_face, string, Qnil); 21383 Qmouse_face, string, Qnil);
21384 if (NILP (b)) 21384 if (NILP (b))
21385 b = make_number (0); 21385 b = make_number (0);
21386 21386
@@ -21397,7 +21397,7 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21397 The internal string is an element of the structures. 21397 The internal string is an element of the structures.
21398 The displayed string is the flatten string. */ 21398 The displayed string is the flatten string. */
21399 for (tmp_glyph = glyph - 1, gpos = 0; 21399 for (tmp_glyph = glyph - 1, gpos = 0;
21400 tmp_glyph->charpos >= XINT(b); 21400 tmp_glyph->charpos >= XINT (b);
21401 tmp_glyph--, gpos++) 21401 tmp_glyph--, gpos++)
21402 { 21402 {
21403 if (tmp_glyph->object != glyph->object) 21403 if (tmp_glyph->object != glyph->object)
@@ -21410,7 +21410,7 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21410 GSEQ_LENGTH is different from SCHARS (STRING). 21410 GSEQ_LENGTH is different from SCHARS (STRING).
21411 SCHARS (STRING) returns the length of the internal string. */ 21411 SCHARS (STRING) returns the length of the internal string. */
21412 for (tmp_glyph = glyph, gseq_length = gpos; 21412 for (tmp_glyph = glyph, gseq_length = gpos;
21413 tmp_glyph->charpos < XINT(e); 21413 tmp_glyph->charpos < XINT (e);
21414 tmp_glyph++, gseq_length++) 21414 tmp_glyph++, gseq_length++)
21415 { 21415 {
21416 if (tmp_glyph->object != glyph->object) 21416 if (tmp_glyph->object != glyph->object)
@@ -21422,9 +21422,9 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21422 total_pixel_width += tmp_glyph->pixel_width; 21422 total_pixel_width += tmp_glyph->pixel_width;
21423 21423
21424 dpyinfo->mouse_face_beg_col = (x - gpos); 21424 dpyinfo->mouse_face_beg_col = (x - gpos);
21425 dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE)? 21425 dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE
21426 (w->current_matrix)->nrows - 1: 21426 ? (w->current_matrix)->nrows - 1
21427 0; 21427 : 0);
21428 21428
21429 dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx); 21429 dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx);
21430 dpyinfo->mouse_face_beg_y = 0; 21430 dpyinfo->mouse_face_beg_y = 0;
@@ -21438,10 +21438,10 @@ note_mode_line_or_margin_highlight (window, x, y, area)
21438 dpyinfo->mouse_face_past_end = 0; 21438 dpyinfo->mouse_face_past_end = 0;
21439 dpyinfo->mouse_face_window = window; 21439 dpyinfo->mouse_face_window = window;
21440 21440
21441 dpyinfo->mouse_face_face_id = face_at_string_position(w, string, 21441 dpyinfo->mouse_face_face_id = face_at_string_position (w, string,
21442 charpos, 21442 charpos,
21443 0, 0, 0, &ignore, 21443 0, 0, 0, &ignore,
21444 glyph->face_id, 1); 21444 glyph->face_id, 1);
21445 show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); 21445 show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
21446 } 21446 }
21447 } 21447 }