Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
No revisions to pull.
------------------------------------------------------------
revno: 100946
committer: Dan Nicolaescu <dann@ics.uci.edu>
branch nick: trunk
timestamp: Thu 2010-07-29 21:42:38 -0700
message:
  * src/buffer.c (Qwindow): Do not define, already defined in data.c.
  (syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-07-29 20:16:18 +0000
+++ src/ChangeLog	2010-07-30 04:42:38 +0000
@@ -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.

=== modified file 'src/buffer.c'
--- src/buffer.c	2010-07-29 05:48:06 +0000
+++ src/buffer.c	2010-07-30 04:42:38 +0000
@@ -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");