# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 977154018 0
# Node ID 30465c00cb0d155e3db4ef240683a7b1d4180b2e
# Parent  9086eef12291e5cc04c2f8c3b624bf33249d5a11
*** empty log message ***

diff -r 9086eef12291 -r 30465c00cb0d lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 18 15:38:53 2000 +0000
+++ b/lisp/ChangeLog	Mon Dec 18 15:40:18 2000 +0000
@@ -1,3 +1,9 @@
+2000-12-18  Gerd Moellmann  <gerd@gnu.org>
+
+	* faces.el (face-spec-set): Interpret a nil in specs for
+	foreground and background colors as `unspecified', for
+	compatibility with 20.x.
+
 2000-12-18  Dave Love  <fx@gnu.org>
 
 	* mail/sendmail.el (send-mail-function): Customize.
diff -r 9086eef12291 -r 30465c00cb0d src/ChangeLog
--- a/src/ChangeLog	Mon Dec 18 15:38:53 2000 +0000
+++ b/src/ChangeLog	Mon Dec 18 15:40:18 2000 +0000
@@ -1,3 +1,7 @@
+2000-12-18  Gerd Moellmann  <gerd@gnu.org>
+
+	* s/hpux10.h (_FILE_OFFSET_BITS): Undef again.
+
 2000-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* msdos.c (IT_set_face): Obey inverse_video.