diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-06-05 04:15:44 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-06-05 04:15:44 +0000 |
| commit | 3d921466217dae7b1adbb61b768aadf500918bcc (patch) | |
| tree | 60c95ec9ec49b6d8a359ea2266477bc867feb257 /src/xfont.c | |
| parent | 6c953d5508550038c09a791acb4b5f996af7831b (diff) | |
| download | emacs-3d921466217dae7b1adbb61b768aadf500918bcc.tar.gz | |
(xfont_list): Don't set registry to iso8859-1 even if it
is unspecified.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |