[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fontset.c,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/src/fontset.c,v |
Date: |
Wed, 08 Oct 2008 22:59:03 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/10/08 22:59:02
Index: fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- fontset.c 29 Aug 2008 07:55:35 -0000 1.145
+++ fontset.c 8 Oct 2008 22:59:02 -0000 1.146
@@ -516,9 +516,9 @@
int id, fallback;
{
Lisp_Object elt, vec, font_group;
- int i;
- FRAME_PTR f = XFRAME (FONTSET_FRAME (fontset));
- int charset_matched = -1;
+ int i, charset_matched = -1;
+ FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)))
+ ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset));
font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
if (! CONSP (font_group))
- [Emacs-diffs] Changes to emacs/src/fontset.c,v,
Chong Yidong <=