aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2014-08-07 16:34:06 +0200
committerMartin Rudalics2014-08-07 16:34:06 +0200
commit7aa06c9cb8edecb23cea0d45c770dca03520ad3d (patch)
tree68d385da8d41ddabca693119031c31994c4c930c
parentb110679002012873c9d44e865e65a5c7f8cc8b1b (diff)
downloademacs-7aa06c9cb8edecb23cea0d45c770dca03520ad3d.tar.gz
emacs-7aa06c9cb8edecb23cea0d45c770dca03520ad3d.zip
In window--min-size-1 set WINDOW arg when calling window-min-pixel-height/-width.
* window.el (window--min-size-1): Explicitly set WINDOW arg in calls of window-min-pixel-height and window-min-pixel-width.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12f5f5fb84c..da80437e12a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-08-07 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (window--min-size-1): Explicitly set WINDOW arg in
4 calls of window-min-pixel-height and window-min-pixel-width.
5
12014-08-07 Reuben Thomas <rrt@sc3d.org> 62014-08-07 Reuben Thomas <rrt@sc3d.org>
2 7
3 * progmodes/ada-mode.el: 8 * progmodes/ada-mode.el:
diff --git a/lisp/window.el b/lisp/window.el
index 28a2be00af9..03caf831111 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1297,7 +1297,7 @@ of WINDOW."
1297 (* (ceiling pixel-width char-size) char-size)) 1297 (* (ceiling pixel-width char-size) char-size))
1298 (if (window--size-ignore-p window ignore) 1298 (if (window--size-ignore-p window ignore)
1299 0 1299 0
1300 (window-min-pixel-width))) 1300 (window-min-pixel-width window)))
1301 (max 1301 (max
1302 (ceiling pixel-width char-size) 1302 (ceiling pixel-width char-size)
1303 (if (window--size-ignore-p window ignore) 1303 (if (window--size-ignore-p window ignore)
@@ -1318,7 +1318,7 @@ of WINDOW."
1318 (* (ceiling pixel-height char-size) char-size)) 1318 (* (ceiling pixel-height char-size) char-size))
1319 (if (window--size-ignore-p window ignore) 1319 (if (window--size-ignore-p window ignore)
1320 0 1320 0
1321 (window-min-pixel-height))) 1321 (window-min-pixel-height window)))
1322 (max (ceiling pixel-height char-size) 1322 (max (ceiling pixel-height char-size)
1323 (if (window--size-ignore-p window ignore) 1323 (if (window--size-ignore-p window ignore)
1324 0 1324 0