# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1095192214 0
# Node ID a2a253587c91831f761908da8de49783ea971c05
# Parent  8f14c8ea51a1ba3a9f9047e692b4184beb6bd226
*** empty log message ***

diff -r 8f14c8ea51a1 -r a2a253587c91 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 14 19:57:52 2004 +0000
+++ b/lisp/ChangeLog	Tue Sep 14 20:03:34 2004 +0000
@@ -1,3 +1,7 @@
+2004-09-14  Kim F. Storm  <storm@cua.dk>
+
+	* faces.el (cursor): Add face-no-inherit property.  Doc fix.
+
 2004-09-14  Simon Josefsson  <jas@extundo.com>
 
 	* files.el (auto-mode-alist): Map .soa and .zone to dns-mode.
diff -r 8f14c8ea51a1 -r a2a253587c91 src/ChangeLog
--- a/src/ChangeLog	Tue Sep 14 19:57:52 2004 +0000
+++ b/src/ChangeLog	Tue Sep 14 20:03:34 2004 +0000
@@ -1,3 +1,12 @@
+2004-09-14  Kim F. Storm  <storm@cua.dk>
+
+	* xfaces.c (Qface_no_inherit): New var.
+	(syms_of_xfaces): Intern and staticpro it.
+	(Finternal_make_lisp_face, Finternal_set_lisp_face_attribute)
+	(Finternal_copy_lisp_face, update_face_from_frame_parameter):
+	Don't increment face_change_count when face has non-nil
+	face-no-inherit property.
+
 2004-09-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* bytecode.c (BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC.
@@ -12512,7 +12521,7 @@
 
 2002-02-15  Andreas Schwab  <schwab@suse.de>
 
-	* puresize.h (BASE_PURESIZE): Increase to 9/5.
+	* puresize.h (PURESIZE_RATIO): Increase to 9/5.
 
 	* alloc.c (NSTATICS): Increase to 1280.