From: Kenichi Handa Date: Mon, 28 Jan 2008 23:59:56 +0000 (+0000) Subject: (font_find_for_lface): Fix previous change. Be sure to X-Git-Tag: emacs-pretest-23.0.90~8295^2~14 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9e11902b2c62a52e7b293c1a2afe488e547b7e0;p=emacs.git (font_find_for_lface): Fix previous change. Be sure to close a font-object. (Ffont_shape_text): If FONT_OBJECT is not a font-object, just return TO. --- diff --git a/src/font.c b/src/font.c index b911ac13030..691f8bc1282 100644 --- a/src/font.c +++ b/src/font.c @@ -2703,6 +2703,7 @@ font_find_for_lface (f, lface, spec, c) if (NILP (val)) return Qnil; result = font_has_char (f, val, c); + font_close_object (f, val); if (result > 0) return val; return Qnil; @@ -3566,6 +3567,9 @@ FONT-OBJECT. */) args_out_of_range_3 (string, from, to); } + if (! FONT_OBJECT_P (font_object)) + return to; + CHECK_FONT_GET_OBJECT (font_object, font); len = end - start; gstring = Ffont_make_gstring (font_object, make_number (len));