summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2014-03-02 13:04:29 +0100
committerMartin Rudalics <rudalics@gmx.at>2014-03-02 13:04:29 +0100
commitb923819c10d71fe1824d0c25787a16a38d08d926 (patch)
tree1070f41f9580b3989c26cba7c3e17f1cccdb9362
parent209fcf3d83a43badc70c027763a691db095085b1 (diff)
In fit-window-to-buffer fix argument in window-size call.
* window.el (fit-window-to-buffer): Fix argument in window-size call when window is horizontally combined.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el2
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 <rudalics@gmx.at>
+
+ * window.el (fit-window-to-buffer): Fix argument in window-size
+ call when window is horizontally combined.
+
2014-03-02 Juanma Barranquero <lekktu@gmail.com>
* 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)