Mercurial > emacs
changeset 99995:6f62aec59b3d
(Fx_font_family_list, syms_of_xfaces): Fix last change.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 27 Nov 2008 20:17:38 +0000 |
| parents | 178782cd97e1 |
| children | 12983da03c67 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 23 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Thu Nov 27 17:08:44 2008 +0000 +++ b/src/xfaces.c Thu Nov 27 20:17:38 2008 +0000 @@ -1828,25 +1828,6 @@ return result; } - -DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, - 0, 1, 0, - doc: /* Return a list of available font families on FRAME. -If FRAME is omitted or nil, use the selected frame. -Value is a list of conses (FAMILY . FIXED-P) where FAMILY -is a font family, and FIXED-P is non-nil if fonts of that family -are fixed-pitch. */) - (frame) - Lisp_Object frame; -{ -#ifdef MSDOS - return Fcons (Fcons (build_string ("default"), Qt), Qnil); -#else - return Ffont_family_list (frame); -#endif -} - - DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 5, 0, doc: /* Return a list of the names of available fonts matching PATTERN. If optional arguments FACE and FRAME are specified, return only fonts @@ -1945,6 +1926,26 @@ #endif /* HAVE_WINDOW_SYSTEM */ +#if defined(HAVE_WINDOW_SYSTEM) || defined(__MSDOS__) + +DEFUN ("x-font-family-list", Fx_font_family_list, Sx_font_family_list, + 0, 1, 0, + doc: /* Return a list of available font families on FRAME. +If FRAME is omitted or nil, use the selected frame. +Value is a list of conses (FAMILY . FIXED-P) where FAMILY +is a font family, and FIXED-P is non-nil if fonts of that family +are fixed-pitch. */) + (frame) + Lisp_Object frame; +{ +#ifdef __MSDOS__ + return Fcons (Fcons (build_string ("default"), Qt), Qnil); +#else + return Ffont_family_list (frame); +#endif +} + +#endif /* HAVE_WINDOW_SYSTEM || __MSDOS__ */ /*********************************************************************** @@ -7023,8 +7024,10 @@ defsubr (&Sx_list_fonts); defsubr (&Sinternal_face_x_get_resource); defsubr (&Sx_family_fonts); +#endif +#if defined(HAVE_WINDOW_SYSTEM) || defined(__MSDOS__) defsubr (&Sx_font_family_list); -#endif /* HAVE_WINDOW_SYSTEM */ +#endif /* HAVE_WINDOW_SYSTEM || __MSDOS__ */ } /* arch-tag: 8a0f7598-5517-408d-9ab3-1da6fcd4c749