[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfont.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfont.c,v |
Date: |
Thu, 05 Jun 2008 04:15:45 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/06/05 04:15:44
Index: xfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfont.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- xfont.c 3 Jun 2008 05:57:28 -0000 1.13
+++ xfont.c 5 Jun 2008 04:15:44 -0000 1.14
@@ -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;