diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index a0ebe4b4484..5679c150efa 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -116,9 +116,6 @@ Lisp_Object minibuf_selected_window; | |||
| 116 | /* Hook run at end of temp_output_buffer_show. */ | 116 | /* Hook run at end of temp_output_buffer_show. */ |
| 117 | static Lisp_Object Qtemp_buffer_show_hook; | 117 | static Lisp_Object Qtemp_buffer_show_hook; |
| 118 | 118 | ||
| 119 | /* Incremented for each window created. */ | ||
| 120 | static int sequence_number; | ||
| 121 | |||
| 122 | /* Nonzero after init_window_once has finished. */ | 119 | /* Nonzero after init_window_once has finished. */ |
| 123 | static int window_initialized; | 120 | static int window_initialized; |
| 124 | 121 | ||
| @@ -286,8 +283,9 @@ adjust_window_count (struct window *w, int arg) | |||
| 286 | b = b->base_buffer; | 283 | b = b->base_buffer; |
| 287 | b->window_count += arg; | 284 | b->window_count += arg; |
| 288 | eassert (b->window_count >= 0); | 285 | eassert (b->window_count >= 0); |
| 289 | /* Catch redisplay's attention. */ | 286 | /* These should be recalculated by redisplay code. */ |
| 290 | w->window_end_valid = 0; | 287 | w->window_end_valid = 0; |
| 288 | w->base_line_pos = 0; | ||
| 291 | } | 289 | } |
| 292 | } | 290 | } |
| 293 | 291 | ||
| @@ -3429,8 +3427,6 @@ make_parent_window (Lisp_Object window, int horflag) | |||
| 3429 | adjust_window_count (p, 1); | 3427 | adjust_window_count (p, 1); |
| 3430 | XSETWINDOW (parent, p); | 3428 | XSETWINDOW (parent, p); |
| 3431 | 3429 | ||
| 3432 | p->sequence_number = ++sequence_number; | ||
| 3433 | |||
| 3434 | replace_window (window, parent, 1); | 3430 | replace_window (window, parent, 1); |
| 3435 | 3431 | ||
| 3436 | wset_next (o, Qnil); | 3432 | wset_next (o, Qnil); |
| @@ -3479,7 +3475,7 @@ make_window (void) | |||
| 3479 | w->nrows_scale_factor = w->ncols_scale_factor = 1; | 3475 | w->nrows_scale_factor = w->ncols_scale_factor = 1; |
| 3480 | w->phys_cursor_type = -1; | 3476 | w->phys_cursor_type = -1; |
| 3481 | w->phys_cursor_width = -1; | 3477 | w->phys_cursor_width = -1; |
| 3482 | w->sequence_number = ++sequence_number; | 3478 | w->column_number_displayed = -1; |
| 3483 | 3479 | ||
| 3484 | /* Reset window_list. */ | 3480 | /* Reset window_list. */ |
| 3485 | Vwindow_list = Qnil; | 3481 | Vwindow_list = Qnil; |