+2000-12-07 Andrew Innes <andrewi@gnu.org>
+
+ * w32fns.c (xlfd_charset_of_font): Fix last change.
+
2000-12-06 Dave Love <fx@gnu.org>
* md5.h (__P): Don't define -- it comes from config.h.
if (!encoding || encoding == fontname)
return NULL;
- charset = strrchr(encoding - 1, '-');
+ for (charset = encoding - 1; charset >= fontname; charset--)
+ if (*charset == '-')
+ break;
- if (!charset || strcmp(charset, "-*-*") == 0)
+ if (charset == fontname || strcmp(charset, "-*-*") == 0)
return NULL;
return charset + 1;