comparison src/window.c @ 6099:19eaf70457d4

(Fset_window_configuration): Allow for menu-bar-lines to have changed since the configuration was created.

6098:b91e19be1513


struct save_window_data
  {
    int size_from_Lisp_Vector_struct;
    struct Lisp_Vector *next_from_Lisp_Vector_struct;
    Lisp_Object frame_width, frame_height;
    Lisp_Object selected_frame;
    Lisp_Object current_window;
    Lisp_Object current_buffer;
    Lisp_Object minibuf_scroll_window;
    Lisp_Object root_window;

	 made, we change the frame to the size specified in the
	 configuration, restore the configuration, and then resize it
	 back.  We keep track of the prevailing height in these variables.  */
      int previous_frame_height = FRAME_HEIGHT (f);
      int previous_frame_width =  FRAME_WIDTH  (f);

      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);

      windows_or_buffers_changed++;

      /* Kludge Alert!
	 Mark all windows now on frame as "deleted".

      /* Set the screen height to the value it had before this function.  */
      if (previous_frame_height != FRAME_HEIGHT (f)
	  || previous_frame_width != FRAME_WIDTH (f))
	change_frame_size (f, previous_frame_height, previous_frame_width,
			   0, 0);
    }

#ifdef MULTI_FRAME
  /* Fselect_window will have made f the selected frame, so we
     reselect the proper frame here.  Fhandle_switch_frame will change the

  data = (struct save_window_data *)
           XVECTOR (Fmake_vector (make_number (SAVE_WINDOW_DATA_SIZE),
				  Qnil));
  XFASTINT (data->frame_width) = FRAME_WIDTH (f);
  XFASTINT (data->frame_height) = FRAME_HEIGHT (f);
#ifdef MULTI_FRAME
  XSET (data->selected_frame, Lisp_Frame, selected_frame);
#endif
  data->current_window = FRAME_SELECTED_WINDOW (f);
  XSET (data->current_buffer, Lisp_Buffer, current_buffer);

6099:19eaf70457d4


struct save_window_data
  {
    int size_from_Lisp_Vector_struct;
    struct Lisp_Vector *next_from_Lisp_Vector_struct;
    Lisp_Object frame_width, frame_height, frame_menu_bar_lines;
    Lisp_Object selected_frame;
    Lisp_Object current_window;
    Lisp_Object current_buffer;
    Lisp_Object minibuf_scroll_window;
    Lisp_Object root_window;

	 made, we change the frame to the size specified in the
	 configuration, restore the configuration, and then resize it
	 back.  We keep track of the prevailing height in these variables.  */
      int previous_frame_height = FRAME_HEIGHT (f);
      int previous_frame_width =  FRAME_WIDTH  (f);
      int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);

      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);
      if (XFASTINT (data->frame_menu_bar_lines)
	  != previous_frame_menu_bar_lines)
	x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0);

      windows_or_buffers_changed++;

      /* Kludge Alert!
	 Mark all windows now on frame as "deleted".

      /* Set the screen height to the value it had before this function.  */
      if (previous_frame_height != FRAME_HEIGHT (f)
	  || previous_frame_width != FRAME_WIDTH (f))
	change_frame_size (f, previous_frame_height, previous_frame_width,
			   0, 0);
      if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
	x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0);
    }

#ifdef MULTI_FRAME
  /* Fselect_window will have made f the selected frame, so we
     reselect the proper frame here.  Fhandle_switch_frame will change the

  data = (struct save_window_data *)
           XVECTOR (Fmake_vector (make_number (SAVE_WINDOW_DATA_SIZE),
				  Qnil));
  XFASTINT (data->frame_width) = FRAME_WIDTH (f);
  XFASTINT (data->frame_height) = FRAME_HEIGHT (f);
  XFASTINT (data->frame_menu_bar_lines) = FRAME_MENU_BAR_LINES (f);
#ifdef MULTI_FRAME
  XSET (data->selected_frame, Lisp_Frame, selected_frame);
#endif
  data->current_window = FRAME_SELECTED_WINDOW (f);
  XSET (data->current_buffer, Lisp_Buffer, current_buffer);