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

[Andreas Schwab]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.515 emacs/src/window.c:1.516
*** emacs/src/window.c:1.515    Tue Aug 16 14:58:33 2005
--- emacs/src/window.c  Sun Sep 18 16:28:53 2005
***************
*** 273,279 ****
    XSETWINDOW (val, p);
    XSETFASTINT (p->last_point, 0);
    p->frozen_window_start_p = 0;
-   p->height_fixed_p = 0;
    p->last_cursor_off_p = p->cursor_off_p = 0;
    p->left_margin_cols = Qnil;
    p->right_margin_cols = Qnil;
--- 273,278 ----
***************
*** 2438,2464 ****
      }
    else if (BUFFERP (w->buffer))
      {
!       if (w->height_fixed_p && !width_p)
!       fixed_p = 1;
!       else
!       {
!         struct buffer *old = current_buffer;
!         Lisp_Object val;
  
!         current_buffer = XBUFFER (w->buffer);
!         val = find_symbol_value (Qwindow_size_fixed);
!         current_buffer = old;
  
!         fixed_p = 0;
!         if (!EQ (val, Qunbound))
!           {
!             fixed_p = !NILP (val);
  
!             if (fixed_p
!                 && ((EQ (val, Qheight) && width_p)
!                     || (EQ (val, Qwidth) && !width_p)))
!               fixed_p = 0;
!           }
        }
  
        /* Can't tell if this one is resizable without looking at
--- 2437,2458 ----
      }
    else if (BUFFERP (w->buffer))
      {
!       struct buffer *old = current_buffer;
!       Lisp_Object val;
  
!       current_buffer = XBUFFER (w->buffer);
!       val = find_symbol_value (Qwindow_size_fixed);
!       current_buffer = old;
  
!       fixed_p = 0;
!       if (!EQ (val, Qunbound))
!       {
!         fixed_p = !NILP (val);
  
!         if (fixed_p
!             && ((EQ (val, Qheight) && width_p)
!                 || (EQ (val, Qwidth) && !width_p)))
!           fixed_p = 0;
        }
  
        /* Can't tell if this one is resizable without looking at