From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 30 Jul 2010 04:42:38 +0000 (-0700)
Subject: * src/buffer.c (Qwindow): Do not define, already defined in data.c.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c09a58f7e64af426e8484d510dc781e6da3e09d;p=emacs.git

* src/buffer.c (Qwindow): Do not define, already defined in data.c.
(syms_of_buffer): Do not intern and staticpro Qwindow.  (Bug#6760)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e4910b32d66..e2832c49bde 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/buffer.c b/src/buffer.c
index 9dd396e6c08..6f41b36b92f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -162,7 +162,7 @@ Lisp_Object Qget_file_buffer;
 
 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 @@ syms_of_buffer (void)
   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");