[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3fb671c88e1 2/2: ; * src/fontset.c: Remove extraneous portion of
From: |
Po Lu |
Subject: |
master 3fb671c88e1 2/2: ; * src/fontset.c: Remove extraneous portion of last change. |
Date: |
Thu, 7 Sep 2023 22:42:13 -0400 (EDT) |
branch: master
commit 3fb671c88e1411248b1dd38d34d347e238d392a0
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
; * src/fontset.c: Remove extraneous portion of last change.
---
src/fontset.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/fontset.c b/src/fontset.c
index 347763cd77e..54d1347f54f 100644
--- 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);