Mercurial > emacs

comparison src/xfaces.c @ 91141:833744ce7f09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_font_frame_param): Adjusted for the change of font_find_for_lface.
author Kenichi Handa <handa@m17n.org>
date Sat, 01 Dec 2007 02:41:23 +0000
parents 66f982c3b25e
children 609500aa30a8
comparison
equal deleted inserted replaced
91140:6ab6b7928830 91141:833744ce7f09
4788 /* We set FONT_NAME to a font-object. */ 4788 /* We set FONT_NAME to a font-object. */
4789 if (FONT_OBJECT_P (LFACE_FONT (lface))) 4789 if (FONT_OBJECT_P (LFACE_FONT (lface)))
4790 font_name = LFACE_FONT (lface); 4790 font_name = LFACE_FONT (lface);
4791 else 4791 else
4792 { 4792 {
4793 font_name = font_find_for_lface (f, &AREF (lface, 0), Qnil); 4793 font_name = font_find_for_lface (f, &AREF (lface, 0), Qnil, -1);
4794 if (NILP (font_name)) 4794 if (NILP (font_name))
4795 error ("No font matches the specified attribute"); 4795 error ("No font matches the specified attribute");
4796 font_name = font_open_for_lface (f, font_name, &AREF (lface, 0), 4796 font_name = font_open_for_lface (f, font_name, &AREF (lface, 0),
4797 Qnil); 4797 Qnil);
4798 if (NILP (font_name)) 4798 if (NILP (font_name))