[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c,v |
Date: |
Thu, 29 May 2008 04:47:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/05/29 04:47:00
Index: xfaces.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfaces.c,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- xfaces.c 29 May 2008 02:48:59 -0000 1.391
+++ xfaces.c 29 May 2008 04:46:59 -0000 1.392
@@ -1754,15 +1754,18 @@
(family, frame)
Lisp_Object family, frame;
{
- struct frame *f = check_x_frame (frame);
- Lisp_Object font_spec = Qnil, vec;
+ Lisp_Object font_spec, vec;
int i, nfonts;
Lisp_Object result;
+ if (NILP (frame))
+ frame = selected_frame;
+ CHECK_LIVE_FRAME (frame);
+
+ font_spec = Ffont_spec (0, NULL);
if (!NILP (family))
{
CHECK_STRING (family);
- font_spec = Ffont_spec (0, NULL);
Ffont_put (font_spec, QCfamily, family);
}
vec = font_list_entities (frame, font_spec);
@@ -1803,13 +1806,13 @@
ASET (v, 0, AREF (font, FONT_FAMILY_INDEX));
ASET (v, 1, FONT_WIDTH_SYMBOLIC (font));
point = PIXEL_TO_POINT (XINT (AREF (font, FONT_SIZE_INDEX)) * 10,
- f->resy);
+ XFRAME (frame)->resy);
ASET (v, 2, make_number (point));
ASET (v, 3, FONT_WEIGHT_SYMBOLIC (font));
ASET (v, 4, FONT_SLANT_SYMBOLIC (font));
spacing = Ffont_get (font, QCspacing);
ASET (v, 5, (NILP (spacing) || EQ (spacing, Qp)) ? Qnil : Qt);
- ASET (v, 6, AREF (font, FONT_NAME_INDEX));
+ ASET (v, 6, Ffont_xlfd_name (font, Qnil));
ASET (v, 7, AREF (font, FONT_REGISTRY_INDEX));
result = Fcons (v, result);
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Glenn Morris, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Eli Zaretskii, 2008/05/16
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/20
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/21
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/21
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Jason Rumney, 2008/05/22
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/25
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Kenichi Handa, 2008/05/28
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v, Juanma Barranquero, 2008/05/28
- [Emacs-diffs] Changes to emacs/src/xfaces.c,v,
Kenichi Handa <=