Mercurial > emacs

comparison src/font.c @ 90695:a1cd7344d6a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_parse_xlfd): Fix the array size of `f'. (register_font_driver): Use EQ to compare driver->type.
author Kenichi Handa <handa@m17n.org>
date Wed, 29 Nov 2006 12:09:56 +0000
parents 424dec0c7b5d
children c1ed0fd37416
comparison
equal deleted inserted replaced
90694:648518494384 90695:a1cd7344d6a2
749 { 749 {
750 int len = strlen (name); 750 int len = strlen (name);
751 int i, j; 751 int i, j;
752 Lisp_Object dpi, spacing; 752 Lisp_Object dpi, spacing;
753 int avgwidth; 753 int avgwidth;
754 char *f[XLFD_LAST_INDEX]; 754 char *f[XLFD_LAST_INDEX + 1];
755 Lisp_Object val; 755 Lisp_Object val;
756 char *p; 756 char *p;
757 757
758 if (len > 255) 758 if (len > 255)
759 /* Maximum XLFD name length is 255. */ 759 /* Maximum XLFD name length is 255. */
2806 if (f && ! driver->draw) 2806 if (f && ! driver->draw)
2807 error ("Unsable font driver for a frame: %s", 2807 error ("Unsable font driver for a frame: %s",
2808 SDATA (SYMBOL_NAME (driver->type))); 2808 SDATA (SYMBOL_NAME (driver->type)));
2809 2809
2810 for (prev = NULL, list = root; list; prev = list, list = list->next) 2810 for (prev = NULL, list = root; list; prev = list, list = list->next)
2811 if (list->driver->type == driver->type) 2811 if (EQ (list->driver->type, driver->type))
2812 error ("Duplicated font driver: %s", SDATA (SYMBOL_NAME (driver->type))); 2812 error ("Duplicated font driver: %s", SDATA (SYMBOL_NAME (driver->type)));
2813 2813
2814 list = malloc (sizeof (struct font_driver_list)); 2814 list = malloc (sizeof (struct font_driver_list));
2815 list->on = 0; 2815 list->on = 0;
2816 list->driver = driver; 2816 list->driver = driver;