From e7c3a8f3d48ca03e521bd59bf24b795d5853b70d Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Sat, 15 Oct 2022 12:56:50 +0200 Subject: [PATCH] Fix one internal naming * src/xdisp.c (estimate_line_height_with_face): Renaming of estimate_mode_line_height. * src/dispextern.h: Update calls. --- src/dispextern.h | 8 ++++---- src/xdisp.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/dispextern.h b/src/dispextern.h index 2f5f4335fe..c673b7e30b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1514,7 +1514,7 @@ #define CURRENT_MODE_LINE_HEIGHT(W) \ : ((W)->mode_line_height \ = (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix) \ ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix) \ - : estimate_mode_line_height \ + : estimate_line_height_with_face \ (XFRAME ((W)->frame), CURRENT_MODE_LINE_ACTIVE_FACE_ID (W))))) /* Return the current height of the header line of window W. If not known @@ -1527,7 +1527,7 @@ #define CURRENT_HEADER_LINE_HEIGHT(W) \ : ((W)->header_line_height \ = (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix) \ ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix) \ - : estimate_mode_line_height \ + : estimate_line_height_with_face \ (XFRAME ((W)->frame), HEADER_LINE_FACE_ID)))) /* Return the current height of the tab line of window W. If not known @@ -1540,7 +1540,7 @@ #define CURRENT_TAB_LINE_HEIGHT(W) \ : ((W)->tab_line_height \ = (MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix) \ ? MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix) \ - : estimate_mode_line_height \ + : estimate_line_height_with_face \ (XFRAME ((W)->frame), TAB_LINE_FACE_ID)))) /* Return the height of the desired mode line of window W. */ @@ -3392,7 +3392,7 @@ #define TTY_CAP_STRIKE_THROUGH 0x20 int window_box_left (struct window *, enum glyph_row_area); int window_box_left_offset (struct window *, enum glyph_row_area); int window_box_right (struct window *, enum glyph_row_area); -int estimate_mode_line_height (struct frame *, enum face_id); +int estimate_line_height_with_face (struct frame *, enum face_id); int move_it_to (struct it *, ptrdiff_t, int, int, int, int); void pixel_to_glyph_coords (struct frame *, int, int, int *, int *, NativeRectangle *, bool); diff --git a/src/xdisp.c b/src/xdisp.c index e390de6a33..6944f13c47 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1274,7 +1274,7 @@ window_box_height (struct window *w) height is essentially the same as that contained in the macro CURRENT_{MODE,HEADER,TAB}_LINE_HEIGHT, except that it checks whether the appropriate glyph row has its `mode_line_p' flag set, and if - it doesn't, uses estimate_mode_line_height instead. */ + it doesn't, uses estimate_line_height_with_face instead. */ if (window_wants_mode_line (w)) { @@ -1289,7 +1289,7 @@ window_box_height (struct window *w) if (ml_row && ml_row->mode_line_p) height -= ml_row->height; else - height -= estimate_mode_line_height + height -= estimate_line_height_with_face (f, CURRENT_MODE_LINE_ACTIVE_FACE_ID (w)); } } @@ -1307,7 +1307,7 @@ window_box_height (struct window *w) if (tl_row && tl_row->mode_line_p) height -= tl_row->height; else - height -= estimate_mode_line_height (f, TAB_LINE_FACE_ID); + height -= estimate_line_height_with_face (f, TAB_LINE_FACE_ID); } } @@ -1324,7 +1324,7 @@ window_box_height (struct window *w) if (hl_row && hl_row->mode_line_p) height -= hl_row->height; else - height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); + height -= estimate_line_height_with_face (f, HEADER_LINE_FACE_ID); } } @@ -2241,11 +2241,11 @@ compute_string_pos (struct text_pos *newpos, struct text_pos pos, Lisp_Object st } /* EXPORT: - Return an estimation of the pixel height of mode or header lines on - frame F. FACE_ID specifies what line's height to estimate. */ + Return an estimation of the pixel height of lines on frame F. + FACE_ID specifies what line's height to estimate. */ int -estimate_mode_line_height (struct frame *f, enum face_id face_id) +estimate_line_height_with_face (struct frame *f, enum face_id face_id) { #ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f)) -- 2.38.0