diff options
| author | Gerd Moellmann | 2001-01-26 20:02:19 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-01-26 20:02:19 +0000 |
| commit | 0130fe1af34ca3ab4b9ad6da2ac00409772d93f0 (patch) | |
| tree | 80960106b64bcd810e28658c0a89c85f3699f391 /src | |
| parent | 940f14b42ec06d19f3bd7e455374b1dbbb5b140c (diff) | |
| download | emacs-0130fe1af34ca3ab4b9ad6da2ac00409772d93f0.tar.gz emacs-0130fe1af34ca3ab4b9ad6da2ac00409772d93f0.zip | |
(size_window): Set the window's orig_top to nil when
changing heights, so that a future shrink_mini_window won't
restore a bogus height.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5229e927211..929096d98ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2001-01-26 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-01-26 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * window.c (size_window): Set the window's orig_top to nil when | ||
| 4 | changing heights, so that a future shrink_mini_window won't | ||
| 5 | restore a bogus height. | ||
| 6 | |||
| 3 | * frame.c (do_switch_frame): If selected frame has a mini-window, | 7 | * frame.c (do_switch_frame): If selected frame has a mini-window, |
| 4 | resize that to exact size. | 8 | resize that to exact size. |
| 5 | 9 | ||
diff --git a/src/window.c b/src/window.c index e507254f8c0..1b6ac07955d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -2445,6 +2445,7 @@ size_window (window, size, width_p, nodelete_p) | |||
| 2445 | sideward = &w->hchild; | 2445 | sideward = &w->hchild; |
| 2446 | forward = &w->vchild; | 2446 | forward = &w->vchild; |
| 2447 | w->height = make_number (size); | 2447 | w->height = make_number (size); |
| 2448 | w->orig_height = Qnil; | ||
| 2448 | } | 2449 | } |
| 2449 | 2450 | ||
| 2450 | if (!NILP (*sideward)) | 2451 | if (!NILP (*sideward)) |
| @@ -3803,6 +3804,8 @@ shrink_mini_window (w) | |||
| 3803 | } | 3804 | } |
| 3804 | else if (XFASTINT (w->height) > 1) | 3805 | else if (XFASTINT (w->height) > 1) |
| 3805 | { | 3806 | { |
| 3807 | /* Distribute the additional lines of the mini-window | ||
| 3808 | among the other windows. */ | ||
| 3806 | Lisp_Object window; | 3809 | Lisp_Object window; |
| 3807 | XSETWINDOW (window, w); | 3810 | XSETWINDOW (window, w); |
| 3808 | enlarge_window (window, 1 - XFASTINT (w->height), 0); | 3811 | enlarge_window (window, 1 - XFASTINT (w->height), 0); |