diff options
| author | Andreas Schwab | 2008-06-18 14:45:11 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-06-18 14:45:11 +0000 |
| commit | 51cf11be0836099f8f87d2f27d76009eb0e94068 (patch) | |
| tree | fd9fd5fc19bb56d12193d05f29dd351531184663 /src | |
| parent | 6795e523e9e8342107905de0d86675ca4971b501 (diff) | |
| download | emacs-51cf11be0836099f8f87d2f27d76009eb0e94068.tar.gz emacs-51cf11be0836099f8f87d2f27d76009eb0e94068.zip | |
(Ffont_face_attributes): Only define if
HAVE_WINDOW_SYSTEM.
(syms_of_font): Only defsubr if HAVE_WINDOW_SYSTEM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/font.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7b14e5eeffa..9f65fbe91b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-06-18 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * font.c (Ffont_face_attributes): Only define if | ||
| 4 | HAVE_WINDOW_SYSTEM. | ||
| 5 | (syms_of_font): Only defsubr if HAVE_WINDOW_SYSTEM. | ||
| 6 | |||
| 1 | 2008-06-18 Jason Rumney <jasonr@gnu.org> | 7 | 2008-06-18 Jason Rumney <jasonr@gnu.org> |
| 2 | 8 | ||
| 3 | * w32font.c (w32font_list, w32font_match): Add logging. | 9 | * w32font.c (w32font_list, w32font_match): Add logging. |
diff --git a/src/font.c b/src/font.c index ff97af063a7..ab413f277f2 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3742,6 +3742,8 @@ FONT is a font-spec, a font-entity, or a font-object. */) | |||
| 3742 | return Fcdr (Fassq (key, AREF (font, FONT_EXTRA_INDEX))); | 3742 | return Fcdr (Fassq (key, AREF (font, FONT_EXTRA_INDEX))); |
| 3743 | } | 3743 | } |
| 3744 | 3744 | ||
| 3745 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 3746 | |||
| 3745 | DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, 2, 0, | 3747 | DEFUN ("font-face-attributes", Ffont_face_attributes, Sfont_face_attributes, 1, 2, 0, |
| 3746 | doc: /* Return a plist of face attributes generated by FONT. | 3748 | doc: /* Return a plist of face attributes generated by FONT. |
| 3747 | FONT is a font name, a font-spec, a font-entity, or a font-object. | 3749 | FONT is a font name, a font-spec, a font-entity, or a font-object. |
| @@ -3811,6 +3813,8 @@ are to be displayed on. If omitted, the selected frame is used. */) | |||
| 3811 | return Flist (10, plist); | 3813 | return Flist (10, plist); |
| 3812 | } | 3814 | } |
| 3813 | 3815 | ||
| 3816 | #endif | ||
| 3817 | |||
| 3814 | DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0, | 3818 | DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0, |
| 3815 | doc: /* Set one property of FONT-SPEC: give property PROP value VAL. */) | 3819 | doc: /* Set one property of FONT-SPEC: give property PROP value VAL. */) |
| 3816 | (font_spec, prop, val) | 3820 | (font_spec, prop, val) |
| @@ -4852,7 +4856,9 @@ syms_of_font () | |||
| 4852 | defsubr (&Sfontp); | 4856 | defsubr (&Sfontp); |
| 4853 | defsubr (&Sfont_spec); | 4857 | defsubr (&Sfont_spec); |
| 4854 | defsubr (&Sfont_get); | 4858 | defsubr (&Sfont_get); |
| 4859 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 4855 | defsubr (&Sfont_face_attributes); | 4860 | defsubr (&Sfont_face_attributes); |
| 4861 | #endif | ||
| 4856 | defsubr (&Sfont_put); | 4862 | defsubr (&Sfont_put); |
| 4857 | defsubr (&Slist_fonts); | 4863 | defsubr (&Slist_fonts); |
| 4858 | defsubr (&Sfont_family_list); | 4864 | defsubr (&Sfont_family_list); |