Mercurial > hg > xemacs-beta
diff src/window.c @ 4375:74e0e1131e01
Update window-size computation.
2008-01-02 Mike Sperber <mike@xemacs.org>
* window.c (set_window_pixsize): Factor in the modeline when
looking at window_min_width. Remove obsolete comment about
incorrect use of `default_face_height_and_width'.
(change_window_height): Remove obsolete comment about
incorrect use of `default_face_height_and_width'.
| author | Mike Sperber <sperber@deinprogramm.de> |
|---|---|
| date | Wed, 02 Jan 2008 10:12:04 +0100 |
| parents | f6f6fc9eb269 |
| children | c32b3d10c56b |
line wrap: on
line diff
--- a/src/window.c Tue Jan 01 22:09:51 2008 -0800 +++ b/src/window.c Wed Jan 02 10:12:04 2008 +0100 @@ -3520,8 +3520,6 @@ int line_size; int defheight, defwidth; - /* #### This is very likely incorrect and instead the char_to_pixel_ - functions should be called. */ default_face_height_and_width (window, &defheight, &defwidth); line_size = (set_height ? defheight : defwidth); @@ -3532,7 +3530,7 @@ if (!nodelete && !TOP_LEVEL_WINDOW_P (w) - && new_pixsize < minsize) + && (new_pixsize + window_modeline_height (w)) < minsize) { Fdelete_window (window, Qnil); return; @@ -4369,8 +4367,6 @@ if (EQ (window, FRAME_ROOT_WINDOW (f))) invalid_operation ("Won't change only window", Qunbound); - /* #### This is very likely incorrect and instead the char_to_pixel_ - functions should be called. */ default_face_height_and_width (window, &defheight, &defwidth); while (1)