Commit 757c70af authored by Eli Zaretskii's avatar Eli Zaretskii

Fix bug #16930 with broken build --without-x.

 src/font.c (Fframe_font_cache): Fix last change.
parent c19ad068
2014-03-03 Eli Zaretskii <eliz@gnu.org>
* font.c (Fframe_font_cache): Fix last change. (Bug#16930)
* gmalloc.c (aligned_alloc): Fix adjustment of size of the
allocated buffer due to alignment.
(freehook): If the block to be freed was allocated by
......
......@@ -4850,7 +4850,14 @@ DEFUN ("frame-font-cache", Fframe_font_cache, Sframe_font_cache, 0, 1, 0,
If FRAME is omitted or nil, use the selected frame. */)
(Lisp_Object frame)
{
return FRAME_DISPLAY_INFO (decode_live_frame (frame))->name_list_element;
#ifdef HAVE_WINDOW_SYSTEM
struct frame *f = decode_live_frame (frame);
if (FRAME_WINDOW_P (f))
return FRAME_DISPLAY_INFO (f)->name_list_element;
else
#endif
return Qnil;
}
#endif /* FONT_DEBUG */
......
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