Mercurial > emacs
changeset 102481:66d0ea986f06
(x_set_font): When ARG is a font-object, don't alter the
fontset of the frame.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 11 Mar 2009 07:53:37 +0000 |
parents | c50bd87f030b |
children | 1c58a919d8b9 |
files | src/frame.c |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Wed Mar 11 07:51:33 2009 +0000 +++ b/src/frame.c Wed Mar 11 07:53:37 2009 +0000 @@ -3399,10 +3399,11 @@ else if (FONT_OBJECT_P (arg)) { font_object = arg; - /* This is store the XLFD font name in the frame parameter for + /* This is to store the XLFD font name in the frame parameter for backward compatiblity. We should store the font-object itself in the future. */ arg = AREF (font_object, FONT_NAME_INDEX); + fontset = FRAME_FONTSET (f); } else signal_error ("Invalid font", arg);