Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 542-553)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 116-121)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

1 files changed, 13 insertions, 19 deletions

diff --git a/src/window.c b/src/window.c
index 4089217825f..198edd3d6d8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -273,7 +273,6 @@ make_window ()
   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;
@@ -2438,27 +2437,22 @@ window_fixed_size_p (w, width_p, check_siblings_p)
     }
   else if (BUFFERP (w->buffer))
     {
-      if (w->height_fixed_p && !width_p)
-        fixed_p = 1;
-      else
-        {
-          struct buffer *old = current_buffer;
-          Lisp_Object val;
+      struct buffer *old = current_buffer;
+      Lisp_Object val;
 
-          current_buffer = XBUFFER (w->buffer);
-          val = find_symbol_value (Qwindow_size_fixed);
-          current_buffer = old;
+      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);
+      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;
-            }
+          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