Remove mark_ttys function and fix tty_display_info initialization.
* lisp.h (mark_ttys): Remove prototype. * alloc.c (Fgarbage_collect): Remove redundant (and the only) call to mark_ttys because all possible values of 'top_frame' slot are the frames which are reachable from Vframe_list. * term.c (mark_ttys): Remove. (init_tty): Safely initialize 'top_frame' slot with Qnil.
This commit is contained in:
parent
c20643e210
commit
c650a5dec6
4 changed files with 11 additions and 18 deletions
|
@ -1,3 +1,13 @@
|
|||
2012-08-31 Dmitry Antipov <dmantipov@yandex.ru>
|
||||
|
||||
Remove mark_ttys function and fix tty_display_info initialization.
|
||||
* lisp.h (mark_ttys): Remove prototype.
|
||||
* alloc.c (Fgarbage_collect): Remove redundant (and the only) call
|
||||
to mark_ttys because all possible values of 'top_frame' slot are
|
||||
the frames which are reachable from Vframe_list.
|
||||
* term.c (mark_ttys): Remove.
|
||||
(init_tty): Safely initialize 'top_frame' slot with Qnil.
|
||||
|
||||
2012-08-31 Dmitry Antipov <dmantipov@yandex.ru>
|
||||
|
||||
Change struct frame bitfields from unsigned char to unsigned.
|
||||
|
|
|
@ -5476,7 +5476,6 @@ See Info node `(elisp)Garbage Collection'. */)
|
|||
}
|
||||
mark_terminals ();
|
||||
mark_kboards ();
|
||||
mark_ttys ();
|
||||
|
||||
#ifdef USE_GTK
|
||||
{
|
||||
|
|
|
@ -3438,7 +3438,6 @@ extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object,
|
|||
|
||||
/* Defined in term.c */
|
||||
extern int *char_ins_del_vector;
|
||||
extern void mark_ttys (void);
|
||||
extern void syms_of_term (void);
|
||||
extern _Noreturn void fatal (const char *msgid, ...)
|
||||
ATTRIBUTE_FORMAT_PRINTF (1, 2);
|
||||
|
|
17
src/term.c
17
src/term.c
|
@ -3001,6 +3001,7 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
|
|||
#else
|
||||
tty = xzalloc (sizeof *tty);
|
||||
#endif
|
||||
tty->top_frame = Qnil;
|
||||
tty->next = tty_list;
|
||||
tty_list = tty;
|
||||
|
||||
|
@ -3541,22 +3542,6 @@ delete_tty (struct terminal *terminal)
|
|||
xfree (tty);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Mark the pointers in the tty_display_info objects.
|
||||
Called by Fgarbage_collect. */
|
||||
|
||||
void
|
||||
mark_ttys (void)
|
||||
{
|
||||
struct tty_display_info *tty;
|
||||
|
||||
for (tty = tty_list; tty; tty = tty->next)
|
||||
mark_object (tty->top_frame);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
syms_of_term (void)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue