procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two further fixes to last changes

Browse source 
* src/xdisp.c (get_narrowed_width): Use FRAME_WINDOW_P instead of
Fterminal_live_p.  Also take WINDOW_LEFT_FRINGE_WIDTH into
account.
This commit is contained in:
Gregory Heytings 2023-04-01 16:54:18 +00:00
parent dce08cf05c
commit 097c5ee8f5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/xdisp.c
View file

@ -3582,12 +3582,13 @@ get_narrowed_width (struct window *w)
{ {
/* In a character-only terminal, only one font size is used, so we /* In a character-only terminal, only one font size is used, so we
can use a smaller factor. */ can use a smaller factor. */
int fact = EQ (Fterminal_live_p (Qnil), Qt) ? 2 : 3; int fact = FRAME_WINDOW_P (XFRAME (w->frame)) ? 3 : 2;
/* If the window has no fringes (in a character-only terminal or in /* If the window has no fringes (in a character-only terminal or in
a GUI frame without fringes), subtract 1 from the width for the a GUI frame without fringes), subtract 1 from the width for the
'\' line wrapping character. */ '\' line wrapping character. */
int width = window_body_width (w, WINDOW_BODY_IN_CANONICAL_CHARS) int width = window_body_width (w, WINDOW_BODY_IN_CANONICAL_CHARS)
- (WINDOW_RIGHT_FRINGE_WIDTH (w) == 0 ? 1 : 0); - ((WINDOW_RIGHT_FRINGE_WIDTH (w) == 0
|| WINDOW_LEFT_FRINGE_WIDTH (w) == 0) ? 1 : 0);
return fact * max (1, width); return fact * max (1, width);
} }