From: Morgan Smith <Morgan.J.Smith@outlook.com>
Date: Sun, 12 May 2024 13:19:30 +0000 (-0400)
Subject: * lisp/window.el (fit-window-to-buffer): Fix width calculation
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~1436
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=42d444114d8df0ffddf1e80891a386c0edcbd976;p=emacs.git

* lisp/window.el (fit-window-to-buffer): Fix width calculation

When PIXELWISE is nil, we still calculate width in pixels and
then convert it to columns.  However, part of the calculation
was using columns where it should have used pixels.  (Bug#70894)
---

diff --git a/lisp/window.el b/lisp/window.el
index 8feeba0d83e..e709e978cc9 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9906,8 +9906,8 @@ accessible position."
 			       ;; the bottom is wider than the window.
 			       (* (window-body-height window pixelwise)
 				  (if pixelwise 1 char-height))))
-                         (- total-width
-                            (window-body-width window pixelwise)))))
+                         (- (* total-width (if pixelwise 1 char-width))
+                            (window-body-width window t)))))
 	  (unless pixelwise
 	    (setq width (/ (+ width char-width -1) char-width)))
           (setq width (max min-width (min max-width width)))