From 2c09a58f7e64af426e8484d510dc781e6da3e09d Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 29 Jul 2010 21:42:38 -0700 Subject: [PATCH] * src/buffer.c (Qwindow): Do not define, already defined in data.c. (syms_of_buffer): Do not intern and staticpro Qwindow. (Bug#6760) --- src/ChangeLog | 5 +++++ src/buffer.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 + + * 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 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"); -- 2.39.2