diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-26 19:10:32 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-26 19:10:32 -0800 |
| commit | 5c9cf0a3f9817220ed0f907637951f5cdf1a9614 (patch) | |
| tree | 05e4de196ed9935479f73f9db5d249684c7d19b4 /src/fontset.c | |
| parent | 848a2dd19d1b030303de1b568edf9e33281e4440 (diff) | |
| parent | 369f945d0b71738812f237123dbe24938d65999e (diff) | |
| download | emacs-5c9cf0a3f9817220ed0f907637951f5cdf1a9614.tar.gz | |
Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c index b76a216bac2..660ca432fad 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1876,6 +1876,8 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, } if (! CHAR_VALID_P (c)) return Qnil; + if (!FRAME_WINDOW_P (f)) + return Qnil; face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil); face = FACE_FROM_ID (f, face_id); if (face->font) |