Mercurial > emacs
changeset 95568:4fec6e274c04
(xfont_list): Don't set registry to iso8859-1 even if it
is unspecified.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 05 Jun 2008 04:15:44 +0000 |
| parents | 4170d7f0d918 |
| children | 2bf09d117bb6 |
| files | src/xfont.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfont.c Thu Jun 05 04:14:48 2008 +0000 +++ b/src/xfont.c Thu Jun 05 04:15:44 2008 +0000 @@ -206,7 +206,8 @@ 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 @@ } 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 @@ /* 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;