Commit df2ead39 authored by Kan-Ru Chen's avatar Kan-Ru Chen Committed by Martin Rudalics
Browse files

Fix `fit-window-to-buffer' (Bug#18498).

* window.el (fit-window-to-buffer): When counting buffer width,
count the whole visible buffer.  Correctly convert the body-height
to pixel size for window-text-pixel-size (Bug#18498).
parent 534f1f7c
2014-09-18 Kan-Ru Chen <kanru@kanru.info>
* window.el (fit-window-to-buffer): When counting buffer width,
count the whole visible buffer. Correctly convert the body-height
to pixel size for window-text-pixel-size (Bug#18498).
2014-09-14 Glenn Morris <rgm@gnu.org>
 
* image.el (image-multi-frame-p): Fix thinko - do not force
......
......@@ -7289,10 +7289,10 @@ accessible position."
max-width))
(+ total-width (window-max-delta
nil t nil nil nil nil pixelwise))))
;; When fitting vertically, assume that WINDOW's start
;; position remains unaltered. WINDOW can't get wider
;; than its frame's pixel width, its height remains
;; unaltered.
;; When fitting horizontally, assume that WINDOW's
;; start position remains unaltered. WINDOW can't get
;; wider than its frame's pixel width, its height
;; remains unaltered.
(width (+ (car (window-text-pixel-size
nil (window-start) (point-max)
(frame-pixel-width)
......@@ -7301,7 +7301,7 @@ accessible position."
;; overshoots when the first line below
;; the bottom is wider than the window.
(* body-height
(if pixelwise char-height 1))))
(if pixelwise 1 char-height))))
(window-right-divider-width))))
(unless pixelwise
(setq width (/ (+ width char-width -1) char-width)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment