Mercurial > emacs
changeset 24608:a16dadaa425d
(Fquery_fontset): Check for fontset aliases here.
(Fnew_fontset, Fset_fontset_font): Don't check for them here.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sat, 10 Apr 1999 02:21:00 +0000 |
| parents | 1ceb1e45b10d |
| children | 38dc0ce2bf99 |
| files | src/fontset.c |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fontset.c Fri Apr 09 19:23:31 1999 +0000 +++ b/src/fontset.c Sat Apr 10 02:21:00 1999 +0000 @@ -464,6 +464,10 @@ if (XSTRING (pattern)->size == 0) return Qnil; + tem = Frassoc (pattern, Vfontset_alias_alist); + if (!NILP (tem)) + return Fcar (tem); + if (NILP (regexpp)) regexp = fontset_pattern_regexp (pattern); else @@ -557,16 +561,15 @@ Lisp_Object name, fontlist; { Lisp_Object fullname, fontset_info; - Lisp_Object tail, tem; + Lisp_Object tail; (*check_window_system_func) (); CHECK_STRING (name, 0); CHECK_LIST (fontlist, 1); - tem = Frassoc (name, Vfontset_alias_alist); fullname = Fquery_fontset (name, Qnil); - if (!NILP (tem) || !NILP (fullname)) + if (!NILP (fullname)) error ("Fontset `%s' matches the existing fontset `%s'", XSTRING (name)->data, XSTRING (fullname)->data); @@ -608,7 +611,6 @@ { int charset; Lisp_Object fullname, fontlist; - Lisp_Object tem; (*check_window_system_func) (); @@ -621,9 +623,8 @@ if ((charset = get_charset_id (charset_symbol)) < 0) error ("Invalid charset: %s", XSYMBOL (charset_symbol)->name->data); - tem = Frassoc (name, Vfontset_alias_alist); fullname = Fquery_fontset (name, Qnil); - if (!NILP (tem) || !NILP (fullname)) + if (!NILP (fullname)) error ("Fontset `%s' does not exist", XSTRING (name)->data); /* If FRAME is not specified, we must, at first, update contents of