[Emacs-diffs] Changes to emacs/src/window.c

[Stefan Monnier]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.485 emacs/src/window.c:1.486
*** emacs/src/window.c:1.485    Sun Nov 14 11:59:21 2004
--- emacs/src/window.c  Tue Nov 16 15:35:14 2004
***************
*** 241,247 ****
    register struct window *p;
  
    p = allocate_window ();
!   XSETFASTINT (p->sequence_number, ++sequence_number);
    XSETFASTINT (p->left_col, 0);
    XSETFASTINT (p->top_line, 0);
    XSETFASTINT (p->total_lines, 0);
--- 241,248 ----
    register struct window *p;
  
    p = allocate_window ();
!   ++sequence_number;
!   XSETFASTINT (p->sequence_number, sequence_number);
    XSETFASTINT (p->left_col, 0);
    XSETFASTINT (p->top_line, 0);
    XSETFASTINT (p->total_lines, 0);
***************
*** 3149,3155 ****
    w = XWINDOW (window);
    w->frozen_window_start_p = 0;
  
!   XSETFASTINT (w->use_time, ++window_select_count);
    if (EQ (window, selected_window))
      return window;
  
--- 3150,3157 ----
    w = XWINDOW (window);
    w->frozen_window_start_p = 0;
  
!   ++window_select_count;
!   XSETFASTINT (w->use_time, window_select_count);
    if (EQ (window, selected_window))
      return window;
  
***************
*** 3640,3646 ****
        = ((struct Lisp_Vector *)o)->contents[i];
    XSETWINDOW (new, p);
  
!   XSETFASTINT (p->sequence_number, ++sequence_number);
  
    /* Put new into window structure in place of window */
    replace_window (window, new);
--- 3642,3649 ----
        = ((struct Lisp_Vector *)o)->contents[i];
    XSETWINDOW (new, p);
  
!   ++sequence_number;
!   XSETFASTINT (p->sequence_number, sequence_number);
  
    /* Put new into window structure in place of window */
    replace_window (window, new);
***************
*** 5882,5888 ****
        p = SAVED_WINDOW_N (vector, i);
        w = XWINDOW (window);
  
!       XSETFASTINT (w->temslot, i++);
        p->window = window;
        p->buffer = w->buffer;
        p->left_col = w->left_col;
--- 5885,5891 ----
        p = SAVED_WINDOW_N (vector, i);
        w = XWINDOW (window);
  
!       XSETFASTINT (w->temslot, i); i++;
        p->window = window;
        p->buffer = w->buffer;
        p->left_col = w->left_col;