Mercurial > emacs
comparison src/fontset.c @ 25668:99290b59352d
(Ffont_info): Change for Lisp_Object selected_frame.
(Ffontset_info): DItto.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 13 Sep 1999 11:13:31 +0000 |
parents | a1e836728879 |
children | d39ec0a27081 |
comparison
equal
deleted
inserted
replaced
25667:7300ea0dd52c | 25668:99290b59352d |
---|---|
707 | 707 |
708 (*check_window_system_func) (); | 708 (*check_window_system_func) (); |
709 | 709 |
710 CHECK_STRING (name, 0); | 710 CHECK_STRING (name, 0); |
711 if (NILP (frame)) | 711 if (NILP (frame)) |
712 f = selected_frame; | 712 frame = selected_frame; |
713 else | 713 CHECK_LIVE_FRAME (frame, 1); |
714 { | 714 f = XFRAME (frame); |
715 CHECK_LIVE_FRAME (frame, 1); | |
716 f = XFRAME (frame); | |
717 } | |
718 | 715 |
719 if (!query_font_func) | 716 if (!query_font_func) |
720 error ("Font query function is not supported"); | 717 error ("Font query function is not supported"); |
721 | 718 |
722 fontp = (*query_font_func) (f, XSTRING (name)->data); | 719 fontp = (*query_font_func) (f, XSTRING (name)->data); |
759 | 756 |
760 (*check_window_system_func) (); | 757 (*check_window_system_func) (); |
761 | 758 |
762 CHECK_STRING(name, 0); | 759 CHECK_STRING(name, 0); |
763 if (NILP (frame)) | 760 if (NILP (frame)) |
764 f = selected_frame; | 761 frame = selected_frame; |
765 else | 762 CHECK_LIVE_FRAME (frame, 1); |
766 { | 763 f = XFRAME (frame); |
767 CHECK_LIVE_FRAME (frame, 1); | |
768 f = XFRAME (frame); | |
769 } | |
770 | 764 |
771 fontset = fs_query_fontset (f, XSTRING (name)->data); | 765 fontset = fs_query_fontset (f, XSTRING (name)->data); |
772 if (fontset < 0) | 766 if (fontset < 0) |
773 error ("Fontset `%s' does not exist", XSTRING (name)->data); | 767 error ("Fontset `%s' does not exist", XSTRING (name)->data); |
774 | 768 |