# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1280464958 25200
# Node ID fe23ee097a5470fdac7fbab4740d0c80c30880a4
# Parent  e77efe427ead59c253c7460d1a763c60e133cc0a
* src/buffer.c (Qwindow): Do not define, already defined in data.c.
(syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)

diff -r e77efe427ead -r fe23ee097a54 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 30 02:02:05 2010 +0000
+++ b/src/ChangeLog	Thu Jul 29 21:42:38 2010 -0700
@@ -1,3 +1,8 @@
+2010-07-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* buffer.c (Qwindow): Do not define, already defined in data.c.
+	(syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)
+
 2010-07-29  Chad Brown  <yandros@mit.edu>
 
 	Replace tests for SYSV_SYSTEM_DIR with HAVE_DIRENT_H, set via autoconf.
diff -r e77efe427ead -r fe23ee097a54 src/buffer.c
--- a/src/buffer.c	Fri Jul 30 02:02:05 2010 +0000
+++ b/src/buffer.c	Thu Jul 29 21:42:38 2010 -0700
@@ -162,7 +162,7 @@
 
 Lisp_Object Qoverlayp;
 
-Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string;
+Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string;
 
 Lisp_Object Qmodification_hooks;
 Lisp_Object Qinsert_in_front_hooks;
@@ -5345,8 +5345,6 @@
   staticpro (&Qget_file_buffer);
   Qpriority = intern_c_string ("priority");
   staticpro (&Qpriority);
-  Qwindow = intern_c_string ("window");
-  staticpro (&Qwindow);
   Qbefore_string = intern_c_string ("before-string");
   staticpro (&Qbefore_string);
   Qafter_string = intern_c_string ("after-string");