From: Po Lu <luangruo@yahoo.com>
Date: Fri, 6 May 2022 12:06:16 +0000 (+0000)
Subject: Improve font specs generated by the Haiku font dialog
X-Git-Tag: emacs-29.0.90~1931^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79bbbb1fcf565d37f20353181df99f8b55cd2c4f;p=emacs.git

Improve font specs generated by the Haiku font dialog

* src/haikufont.c (Fx_select_font): Use `nil' instead of
`unspecified' to be consistent with other font dialogs.
---

diff --git a/src/haikufont.c b/src/haikufont.c
index f8cf45284d0..e0db086aa00 100644
--- a/src/haikufont.c
+++ b/src/haikufont.c
@@ -1231,14 +1231,11 @@ in the font selection dialog.  */)
 
   lfamily = build_string_from_utf8 (family);
   lweight = (pattern.specified & FSPEC_WEIGHT
-	     ? haikufont_weight_to_lisp (pattern.weight)
-	     : Qunspecified);
+	     ? haikufont_weight_to_lisp (pattern.weight) : Qnil);
   lslant = (pattern.specified & FSPEC_SLANT
-	    ? haikufont_slant_to_lisp (pattern.slant)
-	    : Qunspecified);
+	    ? haikufont_slant_to_lisp (pattern.slant) : Qnil);
   lwidth = (pattern.specified & FSPEC_WIDTH
-	    ? haikufont_width_to_lisp (pattern.width)
-	    : Qunspecified);
+	    ? haikufont_width_to_lisp (pattern.width) : Qnil);
   ladstyle = (pattern.specified & FSPEC_STYLE
 	     ? intern (pattern.style) : Qnil);
   lsize = (size >= 0 ? make_fixnum (size) : Qnil);