Mercurial > emacs
changeset 109594:fe23ee097a54
* src/buffer.c (Qwindow): Do not define, already defined in data.c.
(syms_of_buffer): Do not intern and staticpro Qwindow. (Bug#6760)
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 29 Jul 2010 21:42:38 -0700 |
| parents | e77efe427ead |
| children | a854e7a0e7eb |
| files | src/ChangeLog src/buffer.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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");