Mercurial > emacs
comparison src/minibuf.c @ 16051:ccf489f8596e
Removed support for !MULTI_FRAME.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Sun, 01 Sep 1996 21:04:32 +0000 |
| parents | 9c096f0805b0 |
| children | 9b0180c495ff |
comparison
equal
deleted
inserted
replaced
| 16050:c2805a244171 | 16051:ccf489f8596e |
|---|---|
| 202 record_unwind_protect (Fset_window_configuration, | 202 record_unwind_protect (Fset_window_configuration, |
| 203 Fcurrent_window_configuration (Qnil)); | 203 Fcurrent_window_configuration (Qnil)); |
| 204 | 204 |
| 205 /* If the minibuffer window is on a different frame, save that | 205 /* If the minibuffer window is on a different frame, save that |
| 206 frame's configuration too. */ | 206 frame's configuration too. */ |
| 207 #ifdef MULTI_FRAME | |
| 208 mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); | 207 mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window)); |
| 209 if (XFRAME (mini_frame) != selected_frame) | 208 if (XFRAME (mini_frame) != selected_frame) |
| 210 record_unwind_protect (Fset_window_configuration, | 209 record_unwind_protect (Fset_window_configuration, |
| 211 Fcurrent_window_configuration (mini_frame)); | 210 Fcurrent_window_configuration (mini_frame)); |
| 212 | 211 |
| 214 make it visible now. */ | 213 make it visible now. */ |
| 215 Fmake_frame_visible (mini_frame); | 214 Fmake_frame_visible (mini_frame); |
| 216 | 215 |
| 217 if (minibuffer_auto_raise) | 216 if (minibuffer_auto_raise) |
| 218 Fraise_frame (mini_frame); | 217 Fraise_frame (mini_frame); |
| 219 #endif | |
| 220 | 218 |
| 221 /* We have to do this after saving the window configuration | 219 /* We have to do this after saving the window configuration |
| 222 since that is what restores the current buffer. */ | 220 since that is what restores the current buffer. */ |
| 223 | 221 |
| 224 /* Arrange to restore a number of minibuffer-related variables. | 222 /* Arrange to restore a number of minibuffer-related variables. |
| 278 break; | 276 break; |
| 279 } | 277 } |
| 280 } | 278 } |
| 281 } | 279 } |
| 282 | 280 |
| 283 #ifdef MULTI_FRAME | |
| 284 if (XFRAME (mini_frame) != selected_frame) | 281 if (XFRAME (mini_frame) != selected_frame) |
| 285 Fredirect_frame_focus (Fselected_frame (), mini_frame); | 282 Fredirect_frame_focus (Fselected_frame (), mini_frame); |
| 286 #endif | |
| 287 | 283 |
| 288 Vminibuf_scroll_window = selected_window; | 284 Vminibuf_scroll_window = selected_window; |
| 289 Fset_window_buffer (minibuf_window, Fcurrent_buffer ()); | 285 Fset_window_buffer (minibuf_window, Fcurrent_buffer ()); |
| 290 Fselect_window (minibuf_window); | 286 Fselect_window (minibuf_window); |
| 291 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0); | 287 XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0); |