2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aa8ab0341cc..69928b79ff5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Kenichi Handa  <handa@m17n.org>
+
+        * xfont.c (xfont_list_family): Return a list of symbols, not
+        strings.
+
 2008-08-06  Andreas Schwab  <schwab@suse.de>
 
         * config.in: Regenerate.
diff --git a/src/xfont.c b/src/xfont.c
index 83a8c770f86..67cb6e50664 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -473,8 +473,8 @@ xfont_list_family (frame)
         continue;
       last_len = p1 - p0;
       last_family = p0;
-      family = make_unibyte_string (p0, last_len);
-      if (NILP (Fassoc_string (family, list, Qt)))
+      family = font_intern_prop (p0, last_len, 1);
+      if (NILP (assq_no_quit (family, list)))
         list = Fcons (family, list);
     }