diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5c44a1232..17f225708a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-03-02 Martin Rudalics <[email protected]> + + * window.el (fit-window-to-buffer): Fix argument in window-size + call when window is horizontally combined. + 2014-03-02 Juanma Barranquero <[email protected]> * icomplete.el (icomplete-completions): Use string-width. diff --git a/lisp/window.el b/lisp/window.el index be56f8dd69..95672fe87d 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7237,7 +7237,7 @@ accessible position." ((and fit-window-to-buffer-horizontally (not (window-size-fixed-p window t)) (window-combined-p nil t)) - (let* ((total-width (window-size window nil pixelwise)) + (let* ((total-width (window-size window t pixelwise)) (min-width ;; Sanitize MIN-WIDTH. (if (numberp min-width) |