From 3bcdeb847e579981229b065b8dbd01722a94fc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kan-Ru=20Chen=20=28=E9=99=B3=E4=BE=83=E5=A6=82=29?= Date: Thu, 18 Sep 2014 17:36:54 +0800 Subject: Fix fit-window-to-buffer's buffer width calculation * 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. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c82b6f7..9096b92 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,14 @@ +2014-09-18 Kan-Ru Chen + + * 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. + 2014-09-14 Glenn Morris * image.el (image-multi-frame-p): Fix thinko - do not force a delay if none was specified. (Bug#18334) 2014-09-12 Kan-Ru Chen * window.el (fit-window-to-buffer): Doc fix. diff --git a/lisp/window.el b/lisp/window.el index 4dc30ff..c547725 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7296,17 +7296,17 @@ accessible position." (width (+ (car (window-text-pixel-size nil (window-start) (point-max) (frame-pixel-width) ;; Add one char-height to assure that ;; we're on the safe side. This ;; 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))) (unless (= width body-width) (window-resize-no-error window (- (max min-width (min max-width -- 1.9.1