mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
src/font.c (Fframe_font_cache): Fix last change.
This commit is contained in:
Eli Zaretskii 2014-03-03 21:58:20 +02:00
parent c19ad068c5
commit 757c70af04
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
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

9
src/font.c
View file

@ -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 */