diff options
| author | Gerd Moellmann | 2001-01-26 14:41:54 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-01-26 14:41:54 +0000 |
| commit | 550f0e6a236d5019222bf9f5a7dc4a6f0a73093e (patch) | |
| tree | 877b213119f28d73865af88a3ca135276ad3fa9e /src | |
| parent | b7b20fbd16ed724495772ef6bc10744cd9e58b36 (diff) | |
| download | emacs-550f0e6a236d5019222bf9f5a7dc4a6f0a73093e.tar.gz emacs-550f0e6a236d5019222bf9f5a7dc4a6f0a73093e.zip | |
(do_switch_frame): If selected frame has a mini-window,
resize that to exact size.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 49ae3e66d29..5229e927211 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-01-26 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-01-26 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * frame.c (do_switch_frame): If selected frame has a mini-window, | ||
| 4 | resize that to exact size. | ||
| 5 | |||
| 3 | * dispnew.c (adjust_glyph_matrix): Always clear desired matrices. | 6 | * dispnew.c (adjust_glyph_matrix): Always clear desired matrices. |
| 4 | 7 | ||
| 5 | * xdisp.c (display_line): Simplify check for glyphs fitting | 8 | * xdisp.c (display_line): Simplify check for glyphs fitting |
| @@ -7,7 +10,7 @@ | |||
| 7 | 10 | ||
| 8 | * xfns.c (xic_style): New variable. | 11 | * xfns.c (xic_style): New variable. |
| 9 | (create_frame_xic): Move static variable to global scope for | 12 | (create_frame_xic): Move static variable to global scope for |
| 10 | the case that `static' get's defined away. | 13 | the case that `static' gets defined away. |
| 11 | 14 | ||
| 12 | 2001-01-26 Kenichi Handa <handa@etl.go.jp> | 15 | 2001-01-26 Kenichi Handa <handa@etl.go.jp> |
| 13 | 16 | ||
diff --git a/src/frame.c b/src/frame.c index fae6f8c7b3d..6850c92dc27 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -620,6 +620,9 @@ do_switch_frame (frame, no_enter, track) | |||
| 620 | #endif /* HAVE_X_WINDOWS */ | 620 | #endif /* HAVE_X_WINDOWS */ |
| 621 | #endif /* ! 0 */ | 621 | #endif /* ! 0 */ |
| 622 | 622 | ||
| 623 | if (FRAME_HAS_MINIBUF_P (sf)) | ||
| 624 | resize_mini_window (XWINDOW (FRAME_MINIBUF_WINDOW (sf)), 1); | ||
| 625 | |||
| 623 | selected_frame = frame; | 626 | selected_frame = frame; |
| 624 | if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) | 627 | if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) |
| 625 | last_nonminibuf_frame = XFRAME (selected_frame); | 628 | last_nonminibuf_frame = XFRAME (selected_frame); |