From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 30 Dec 2020 02:34:17 +0000 (+0100)
Subject: Improve the `long' computation of `mode-line-compact'
X-Git-Tag: emacs-28.0.90~4495
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc308c80ee5825d237ac535247f48d0237a24dad;p=emacs.git

Improve the `long' computation of `mode-line-compact'

* src/xdisp.c (display_mode_line): Compute `long' based on total
window width, and use the passed-in window instead of the selected
window.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 7ad6b1b1892..7b430041f98 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25467,8 +25467,7 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
     {
       Lisp_Object mode_string = Fformat_mode_line (format, Qnil, Qnil, Qnil);
       if (EQ (Vmode_line_compact, Qlong)
-	  && window_body_width (XWINDOW (selected_window), false) >=
-	  SCHARS (mode_string))
+	  && WINDOW_TOTAL_COLS (w) >= SCHARS (mode_string))
 	{
 	  /* The window is wide enough; just display the mode line we
 	     just computed. */