From 7740d2c7fa7876172239e6d974b473fde07095cf Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 5 Jun 2008 04:18:55 +0000 Subject: [PATCH] (xfont_list): Don't set registry to iso8859-1 even if it is unspecified. --- src/ChangeLog | 9 +++++++++ src/xfont.c | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9abd806ce63..454aa92093f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2008-06-05 Kenichi Handa + + * xfont.c (xfont_list): Don't set registry to iso8859-1 even if it + is unspecified. + + * xfaces.c (realize_x_face): If the font-related face attributes + are the same as those of default face, realize a new fontset + from default->fontset. + 2008-06-05 Stefan Monnier * xdisp.c (move_it_in_display_line_to): Improve the type of its args. diff --git a/src/xfont.c b/src/xfont.c index 8684af43122..8e11d204089 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -206,7 +206,8 @@ extern Lisp_Object Vface_alternative_font_registry_alist; static int compare_font_names (const void *name1, const void *name2) { - return xstrcasecmp (*(const char **) name1, *(const char **) name2); + return xstrcasecmp (*(const unsigned char **) name1, + *(const unsigned char **) name2); } static Lisp_Object xfont_list_pattern P_ ((Lisp_Object, Display *, char *)); @@ -325,8 +326,6 @@ xfont_list (frame, spec) } registry = AREF (spec, FONT_REGISTRY_INDEX); - if (NILP (registry)) - ASET (spec, FONT_REGISTRY_INDEX, Qiso8859_1); len = font_unparse_xlfd (spec, 0, name, 256); ASET (spec, FONT_REGISTRY_INDEX, registry); if (len < 0) @@ -371,7 +370,7 @@ xfont_list (frame, spec) /* Try alias. */ val = assq_no_quit (QCname, AREF (spec, FONT_EXTRA_INDEX)); if (CONSP (val) && STRINGP (XCDR (val))) - list = xfont_list_pattern (frame, display, SDATA (XCDR (val))); + list = xfont_list_pattern (frame, display, (char *) SDATA (XCDR (val))); } return list; -- 2.39.2