; * src/fontset.c: Remove extraneous portion of last change.

diff --git a/src/fontset.c b/src/fontset.c
index 347763cd77e3cf0fcde746440250e8415eb9d226..54d1347f54fda0ebd754fb871222b552a1b85aae 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1839,19 +1839,11 @@ fontset_from_font (Lisp_Object font_object)
                                Vfontset_alias_alist);
 
   xlfd = AREF (font_object, FONT_NAME_INDEX);
-
-  /* XLFD can be nil if the font's registry or family name gives rise
-     to an XLFD name that cannot be represented within 255
-     characters.  (bug#65800) */
-
-  if (!NILP (xlfd))
-    {
-      alias = Fdowncase (xlfd);
-      Vfontset_alias_alist
-       = Fcons (Fcons (name, alias), Vfontset_alias_alist);
-      auto_fontset_alist
-       = Fcons (Fcons (font_spec, fontset), auto_fontset_alist);
-    }
+  alias = Fdowncase (xlfd);
+  Vfontset_alias_alist
+    = Fcons (Fcons (name, alias), Vfontset_alias_alist);
+  auto_fontset_alist
+    = Fcons (Fcons (font_spec, fontset), auto_fontset_alist);
 
   font_spec = Ffont_spec (0, NULL);
   ASET (font_spec, FONT_REGISTRY_INDEX, registry);