Mercurial > emacs

comparison src/window.c @ 21533:b7df83bf15ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fset_window_configuration): Fix mixing of Lisp_Object and int.
author Andreas Schwab <schwab@suse.de>
date Tue, 14 Apr 1998 13:11:34 +0000
parents fa9ff387d260
children 697991d2a2c4
comparison
equal deleted inserted replaced
21532:fff5e42d7b2a 21533:b7df83bf15ff
3305 if it runs during this. */ 3305 if it runs during this. */
3306 BLOCK_INPUT; 3306 BLOCK_INPUT;
3307 3307
3308 if (XFASTINT (data->frame_height) != previous_frame_height 3308 if (XFASTINT (data->frame_height) != previous_frame_height
3309 || XFASTINT (data->frame_width) != previous_frame_width) 3309 || XFASTINT (data->frame_width) != previous_frame_width)
3310 change_frame_size (f, data->frame_height, data->frame_width, 0, 0); 3310 change_frame_size (f, XFASTINT (data->frame_height),
3311 XFASTINT (data->frame_width), 0, 0);
3311 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) 3312 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS)
3312 if (XFASTINT (data->frame_menu_bar_lines) 3313 if (XFASTINT (data->frame_menu_bar_lines)
3313 != previous_frame_menu_bar_lines) 3314 != previous_frame_menu_bar_lines)
3314 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); 3315 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0));
3315 #endif 3316 #endif
3316 3317
3317 if (! NILP (XWINDOW (selected_window)->buffer)) 3318 if (! NILP (XWINDOW (selected_window)->buffer))
3318 { 3319 {
3319 w = XWINDOW (selected_window); 3320 w = XWINDOW (selected_window);
3460 || previous_frame_width != FRAME_WIDTH (f)) 3461 || previous_frame_width != FRAME_WIDTH (f))
3461 change_frame_size (f, previous_frame_height, previous_frame_width, 3462 change_frame_size (f, previous_frame_height, previous_frame_width,
3462 0, 0); 3463 0, 0);
3463 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) 3464 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS)
3464 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 3465 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
3465 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0); 3466 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines),
3467 make_number (0));
3466 #endif 3468 #endif
3467 3469
3468 UNBLOCK_INPUT; 3470 UNBLOCK_INPUT;
3469 3471
3470 /* Fselect_window will have made f the selected frame, so we 3472 /* Fselect_window will have made f the selected frame, so we