Commit 5a80236f authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* nsterm.m (x_free_frame_resources):

* term.c (tty_free_frame_resources):
* xterm.c (x_free_frame_resources): Do not check for non-NULL
face cache because it's implied by free_frame_faces anyway.
* w32term.c (x_free_frame_resources): Likewise.  Do not call
free_frame_faces twice.
parent 5b4f37ab
2013-12-11 Dmitry Antipov <dmantipov@yandex.ru>
* nsterm.m (x_free_frame_resources):
* term.c (tty_free_frame_resources):
* xterm.c (x_free_frame_resources): Do not check for non-NULL
face cache because it's implied by free_frame_faces anyway.
* w32term.c (x_free_frame_resources): Likewise. Do not call
free_frame_faces twice.
2013-12-11 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
* editfns.c (Fformat_time_string): Mention %F in the doc.
......
......@@ -1155,9 +1155,7 @@ Free a pool and temporary objects it refers to (callable from C)
block_input ();
free_frame_menubar (f);
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
free_frame_faces (f);
if (f == dpyinfo->x_focus_frame)
dpyinfo->x_focus_frame = 0;
......
......@@ -3833,10 +3833,7 @@ static void
tty_free_frame_resources (struct frame *f)
{
eassert (FRAME_TERMCAP_P (f));
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
free_frame_faces (f);
xfree (f->output_data.tty);
}
......@@ -3848,9 +3845,7 @@ static void
tty_free_frame_resources (struct frame *f)
{
eassert (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f));
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
free_frame_faces (f);
}
#endif /* MSDOS */
......
......@@ -6080,17 +6080,13 @@ x_free_frame_resources (struct frame *f)
/* We must free faces before destroying windows because some
font-driver (e.g. xft) access a window while finishing a
face. */
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
free_frame_faces (f);
if (FRAME_W32_WINDOW (f))
my_destroy_window (f, FRAME_W32_WINDOW (f));
free_frame_menubar (f);
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
xfree (f->output_data.w32);
f->output_data.w32 = NULL;
......
......@@ -9129,8 +9129,7 @@ x_free_frame_resources (struct frame *f)
/* We must free faces before destroying windows because some
font-driver (e.g. xft) access a window while finishing a
face. */
if (FRAME_FACE_CACHE (f))
free_frame_faces (f);
free_frame_faces (f);
if (f->output_data.x->icon_desc)
XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment