[Emacs-diffs] trunk r116646: Fix bug #16930 with broken build --without-x.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116646
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16930
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2014-03-03 21:58:20 +0200
message:
  Fix bug #16930 with broken build --without-x.
  
   src/font.c (Fframe_font_cache): Fix last change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-03 16:46:36 +0000
+++ b/src/ChangeLog     2014-03-03 19:58:20 +0000
@@ -1,5 +1,7 @@
 2014-03-03  Eli Zaretskii  <address@hidden>
 
+       * 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

=== modified file 'src/font.c'
--- a/src/font.c        2014-03-03 07:46:08 +0000
+++ b/src/font.c        2014-03-03 19:58:20 +0000
@@ -4850,7 +4850,14 @@
 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 */