*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8eafef3771e6e98ff02dde4df2b1ce18cb8816fb..bba5b368d845666f2e61fef9783d7bb89897ed73 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 7e3d4ee465b85566aeec716ec010db8c17cb876c..2a61f0300556daf8a23ebc5488def762038cc5be 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.