diff src/window.c @ 83292:ad07ff6e4555

Merged from [e-mail]--gnu-2005 (patch 67, 270-278) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-270 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-271 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-272 src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-273 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-274 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-275 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-276 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-277 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-278 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-67 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-332

--- a/src/window.c	Mon Apr 25 11:47:55 2005 +0000
+++ b/src/window.c	Mon Apr 25 11:49:38 2005 +0000
@@ -81,10 +81,6 @@
 				 void *));
 static Lisp_Object window_list_1 P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 
-/* The value of `window-size-fixed'.  */
-
-int window_size_fixed;
-
 /* This is the window in which the terminal's cursor should
    be left when nothing is being done with it.  This must
    always be a leaf window, and its buffer is selected by
@@ -6671,6 +6667,7 @@
 {
   Qwindow_size_fixed = intern ("window-size-fixed");
   staticpro (&Qwindow_size_fixed);
+  Fset (Qwindow_size_fixed, Qnil);
 
   staticpro (&Qwindow_configuration_change_hook);
   Qwindow_configuration_change_hook
@@ -6879,16 +6876,6 @@
 The selected frame is the one whose configuration has changed.  */);
   Vwindow_configuration_change_hook = Qnil;
 
-  DEFVAR_BOOL ("window-size-fixed", &window_size_fixed,
-	       doc: /* Non-nil in a buffer means windows displaying the buffer are fixed-size.
-If the value is`height', then only the window's height is fixed.
-If the value is `width', then only the window's width is fixed.
-Any other non-nil value fixes both the width and the height.
-Emacs won't change the size of any window displaying that buffer,
-unless you explicitly change the size, or Emacs has no other choice.  */);
-  Fmake_variable_buffer_local (Qwindow_size_fixed);
-  window_size_fixed = 0;
-
   defsubr (&Sselected_window);
   defsubr (&Sminibuffer_window);
   defsubr (&Swindow_minibuffer_p);