Mercurial > hg > xemacs-beta
changeset 4141:77138fc618a9
[xemacs-hg @ 2007-08-24 13:03:04 by crestani]
2007-08-17 Marcus Crestani <crestani@xemacs.org>
* buffer.c (Fkill_buffer):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (console_type_create_objects_tty):
* syntax.c (uninit_buffer_syntax_cache): Keep functions that do
nothing for NEW_GC instead of removing them.
| author | crestani |
|---|---|
| date | Fri, 24 Aug 2007 13:03:07 +0000 |
| parents | 89310296a3be |
| children | f44ccf5caedc |
| files | src/ChangeLog src/buffer.c src/objects-tty.c src/syntax.c |
| diffstat | 4 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Aug 23 21:51:35 2007 +0000 +++ b/src/ChangeLog Fri Aug 24 13:03:07 2007 +0000 @@ -1,3 +1,12 @@ +2007-08-17 Marcus Crestani <crestani@xemacs.org> + + * buffer.c (Fkill_buffer): + * objects-tty.c (tty_finalize_color_instance): + * objects-tty.c (tty_finalize_font_instance): + * objects-tty.c (console_type_create_objects_tty): + * syntax.c (uninit_buffer_syntax_cache): Keep functions that do + nothing for NEW_GC instead of removing them. + 2007-08-18 Vin Shelton <acs@xemacs.org> * frame-msw.c (mswindows_init_frame_3): Restore extra call to
--- a/src/buffer.c Thu Aug 23 21:51:35 2007 +0000 +++ b/src/buffer.c Fri Aug 24 13:03:07 2007 +0000 @@ -1348,9 +1348,7 @@ } uninit_buffer_markers (b); -#ifndef NEW_GC uninit_buffer_syntax_cache (b); -#endif /* not NEW_GC */ kill_buffer_local_variables (b);
--- a/src/objects-tty.c Thu Aug 23 21:51:35 2007 +0000 +++ b/src/objects-tty.c Fri Aug 24 13:03:07 2007 +0000 @@ -218,14 +218,14 @@ { } -#ifndef NEW_GC static void tty_finalize_color_instance (Lisp_Color_Instance *c) { +#ifndef NEW_GC if (c->data) xfree (c->data, void *); +#endif /* not NEW_GC */ } -#endif /* not NEW_GC */ static int tty_color_instance_equal (Lisp_Color_Instance *c1, @@ -313,14 +313,14 @@ { } -#ifndef NEW_GC static void tty_finalize_font_instance (Lisp_Font_Instance *f) { +#ifndef NEW_GC if (f->data) xfree (f->data, void *); +#endif /* not NEW_GC */ } -#endif /* not NEW_GC */ static Lisp_Object tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), @@ -417,9 +417,7 @@ CONSOLE_HAS_METHOD (tty, initialize_color_instance); CONSOLE_HAS_METHOD (tty, mark_color_instance); CONSOLE_HAS_METHOD (tty, print_color_instance); -#ifndef NEW_GC CONSOLE_HAS_METHOD (tty, finalize_color_instance); -#endif /* not NEW_GC */ CONSOLE_HAS_METHOD (tty, color_instance_equal); CONSOLE_HAS_METHOD (tty, color_instance_hash); CONSOLE_HAS_METHOD (tty, valid_color_name_p); @@ -428,9 +426,7 @@ CONSOLE_HAS_METHOD (tty, initialize_font_instance); CONSOLE_HAS_METHOD (tty, mark_font_instance); CONSOLE_HAS_METHOD (tty, print_font_instance); -#ifndef NEW_GC CONSOLE_HAS_METHOD (tty, finalize_font_instance); -#endif /* not NEW_GC */ CONSOLE_HAS_METHOD (tty, font_list); #ifdef MULE CONSOLE_HAS_METHOD (tty, font_spec_matches_charset);
--- a/src/syntax.c Thu Aug 23 21:51:35 2007 +0000 +++ b/src/syntax.c Fri Aug 24 13:03:07 2007 +0000 @@ -537,16 +537,16 @@ reset_buffer_syntax_cache_range (cache, cache->object, 0); } -#ifndef NEW_GC /* finalize the syntax cache for BUF */ void uninit_buffer_syntax_cache (struct buffer *buf) { +#ifndef NEW_GC xfree (buf->syntax_cache, struct syntax_cache *); buf->syntax_cache = 0; +#endif /* not NEW_GC */ } -#endif /* not NEW_GC */ /* extent-specific APIs used in extents.c and insdel.c */