From: Kenichi Handa <handa@m17n.org>
Date: Wed, 14 May 2008 10:38:43 +0000 (+0000)
Subject: (font_prop_validate): Make nil a valid value.
X-Git-Tag: emacs-pretest-23.0.90~5537
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f09f444ca5da8047d0e586193cd0fb02bf584b7;p=emacs.git

(font_prop_validate): Make nil a valid value.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ed2059ebd37..223356eaad2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Kenichi Handa  <handa@m17n.org>
+
+	* font.c (font_prop_validate): Make nil a valid value.
+
 2008-05-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* emacs.c (main_thread): Conditionalize on
diff --git a/src/font.c b/src/font.c
index 07bd9a2af2e..c5cf732bfe9 100644
--- a/src/font.c
+++ b/src/font.c
@@ -566,6 +566,8 @@ font_prop_validate (idx, prop, val)
 {
   Lisp_Object validated;
 
+  if (NILP (val))
+    return val;
   if (NILP (prop))
     prop = *font_property_table[idx].key;
   else