# HG changeset patch # User Andreas Schwab # Date 892559494 0 # Node ID b7df83bf15ffebeae42d810f399640f14fe41164 # Parent fff5e42d7b2af2f557a6ebbe81bb2a34f86db363 (Fset_window_configuration): Fix mixing of Lisp_Object and int. diff -r fff5e42d7b2a -r b7df83bf15ff src/window.c --- a/src/window.c Tue Apr 14 13:10:35 1998 +0000 +++ b/src/window.c Tue Apr 14 13:11:34 1998 +0000 @@ -3307,11 +3307,12 @@ if (XFASTINT (data->frame_height) != previous_frame_height || XFASTINT (data->frame_width) != previous_frame_width) - change_frame_size (f, data->frame_height, data->frame_width, 0, 0); + change_frame_size (f, XFASTINT (data->frame_height), + XFASTINT (data->frame_width), 0, 0); #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) if (XFASTINT (data->frame_menu_bar_lines) != previous_frame_menu_bar_lines) - x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); + x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0)); #endif if (! NILP (XWINDOW (selected_window)->buffer)) @@ -3462,7 +3463,8 @@ 0, 0); #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) - x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0); + x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), + make_number (0)); #endif UNBLOCK_INPUT;