comparison src/window.c @ 1326:709532b86646

* window.c (SAVE_WINDOW_DATA_SIZE): Define this using sizeof, instead of just saying it's 7; that way, we won't get screwed if we add members to struct save_window_data. * window.c (Fset_window_configuration): The pointer to the saved window data is called `data', not just `d'.

1325:f03e559aac3e

    Lisp_Object root_window;
    Lisp_Object focus_frame;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };
#define SAVE_WINDOW_DATA_SIZE 7 /* Arg to Fmake_vector */

/* This is saved as a Lisp_Vector */
struct saved_window
  {
    /* these first two must agree with struct Lisp_Vector in lisp.h */

  /* Fselect_window will have made f the selected frame, so we
     reselect the proper frame here.  Fselect_frame will change the
     selected window too, but that doesn't make the call to
     Fselect_window above totally superfluous; it still sets f's
     selected window.  */
  Fselect_frame (d->selected_frame);

  if (!NILP (new_current_buffer))
    Fset_buffer (new_current_buffer);

#ifdef MULTI_FRAME

1326:709532b86646

    Lisp_Object root_window;
    Lisp_Object focus_frame;
    /* A vector, interpreted as a struct saved_window */
    Lisp_Object saved_windows;
  };

/* Arg to Fmake_vector */
#define SAVE_WINDOW_DATA_SIZE						\
  ((sizeof (struct save_window_data)					\
    - (sizeof (struct Lisp_Vector)					\
       /* Don't count the contents member of the struct Lisp_Vector */	\
       - sizeof (Lisp_Object)))						\
   / sizeof (Lisp_Object))

/* This is saved as a Lisp_Vector */
struct saved_window
  {
    /* these first two must agree with struct Lisp_Vector in lisp.h */

  /* Fselect_window will have made f the selected frame, so we
     reselect the proper frame here.  Fselect_frame will change the
     selected window too, but that doesn't make the call to
     Fselect_window above totally superfluous; it still sets f's
     selected window.  */
  Fselect_frame (data->selected_frame);

  if (!NILP (new_current_buffer))
    Fset_buffer (new_current_buffer);

#ifdef MULTI_FRAME