# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1218835921 0
# Node ID 46d2c5d06bf4a0e0121e04874191fe02efed9953
# Parent  07ebe6a2286879e230d5bf7137d095767ea27caa
* 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 -r 07ebe6a22868 -r 46d2c5d06bf4 src/ChangeLog
--- a/src/ChangeLog	Fri Aug 15 20:17:12 2008 +0000
+++ b/src/ChangeLog	Fri Aug 15 21:32:01 2008 +0000
@@ -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