comparison src/alloc.c @ 111758:0813efd37bf9

Fix image cache marking bug (Bug#6301). * src/alloc.c (mark_terminals): Ensure that the image cache is marked even if the terminal object was marked earlier (Bug#6301).

111757:e9a44a85f427

{
  struct terminal *t;
  for (t = terminal_list; t; t = t->next_terminal)
    {
      eassert (t->name != NULL);
      if (!VECTOR_MARKED_P (t))
	{
#ifdef HAVE_WINDOW_SYSTEM
	  mark_image_cache (t->image_cache);
#endif /* HAVE_WINDOW_SYSTEM */
	  mark_vectorlike ((struct Lisp_Vector *)t);
	}
    }
}

111758:0813efd37bf9

{
  struct terminal *t;
  for (t = terminal_list; t; t = t->next_terminal)
    {
      eassert (t->name != NULL);
#ifdef HAVE_WINDOW_SYSTEM
      /* If a terminal object is reachable from a stacpro'ed object,
	 it might have been marked already.  Make sure the image cache
	 gets marked.  */
      mark_image_cache (t->image_cache);
#endif /* HAVE_WINDOW_SYSTEM */
      if (!VECTOR_MARKED_P (t))
	mark_vectorlike ((struct Lisp_Vector *)t);
    }
}