From: Kenichi Handa <handa@m17n.org>
Date: Tue, 24 Apr 2007 11:35:15 +0000 (+0000)
Subject: (font_at): If the window W is not on a window system,
X-Git-Tag: emacs-pretest-23.0.90~8295^2~542
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1385a8061f0a187e18ba79540481e7698f2e0667;p=emacs.git

(font_at): If the window W is not on a window system,
return Qnil.
---

diff --git a/src/font.c b/src/font.c
index b0838cee1c0..e6d38dee2fb 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2888,6 +2888,8 @@ font_at (c, pos, face, w, object)
   int dummy;
 
   f = XFRAME (w->frame);
+  if (! FRAME_WINDOW_P (f))
+    return Qnil;
   if (! face)
     {
       if (STRINGP (object))