From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 15 Aug 2008 21:32:01 +0000 (+0000)
Subject: * xfaces.c (lookup_derived_face): Properly handle possible zero
X-Git-Tag: emacs-pretest-23.0.90~3464
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef1fba80054c436b118c85bb8f62c10a8294775a;p=emacs.git

* xfaces.c (lookup_derived_face): Properly handle possible zero
return value of get_lface_attributes.
(merge_faces): Don't tell lookup_derived_face to signal an error
if face is not found.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5226f6579fb..197a01f5bcc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-15  Chong Yidong  <cyd@stupidchicken.com>
 
+	* xfaces.c (lookup_derived_face): Properly handle possible zero
+	return value of get_lface_attributes.
+	(merge_faces): Don't tell lookup_derived_face to signal an error
+	if face is not found.
+
 	* dired.c (Fdirectory_files): Doc fix.
 
 	* process.c (make_process): Initialize kill_without_query struct