Mercurial > emacs
changeset 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'.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sat, 03 Oct 1992 07:15:35 +0000 |
| parents | f03e559aac3e |
| children | ef16e7c0d402 |
| files | src/window.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Sat Oct 03 05:42:42 1992 +0000 +++ b/src/window.c Sat Oct 03 07:15:35 1992 +0000 @@ -2305,7 +2305,14 @@ /* A vector, interpreted as a struct saved_window */ Lisp_Object saved_windows; }; -#define SAVE_WINDOW_DATA_SIZE 7 /* Arg to Fmake_vector */ + +/* 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 @@ -2494,7 +2501,7 @@ 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); + Fselect_frame (data->selected_frame); if (!NILP (new_current_buffer)) Fset_buffer (new_current_buffer);