From 71025e5e1d69b9749c1c64668c69386f1f07f601 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Thu, 20 Feb 1997 06:49:05 +0000 Subject: [PATCH] Include "charset.h" [HAVE_WINDOW_SYSTEM]: Include fontset.h. (make_frame): Allocate member `fontset_data' of the struct frame. (Fdelete_frame): Free the area for the member. --- src/frame.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/frame.c b/src/frame.c index 937336c4873..9c3e5241f61 100644 --- a/src/frame.c +++ b/src/frame.c @@ -22,6 +22,10 @@ Boston, MA 02111-1307, USA. */ #include #include "lisp.h" +#include "charset.h" +#ifdef HAVE_WINDOW_SYSTEM +#include "fontset.h" +#endif #include "frame.h" #include "termhooks.h" #include "window.h" @@ -360,6 +364,10 @@ make_frame (mini_p) a newly-created, never-selected window. */ XSETFASTINT (XWINDOW (f->selected_window)->use_time, ++window_select_count); +#ifdef HAVE_WINDOW_SYSTEM + f->fontset_data = alloc_fontset_data (); +#endif + return f; } @@ -1152,6 +1160,11 @@ but if the second optional argument FORCE is non-nil, you may do so.") if (FRAME_DELETE_COST (f)) free (FRAME_DELETE_COST (f)); +#ifdef HAVE_WINDOW_SYSTEM + /* Free all fontset data. */ + free_fontset_data (FRAME_FONTSET_DATA (f)); +#endif + /* Since some events are handled at the interrupt level, we may get an event for f at any time; if we zero out the frame's display now, then we may trip up the event-handling code. Instead, we'll -- 2.39.5