# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1004358358 0
# Node ID 56bff1d567d65528d87f94ed5fa18fd312e569cf
# Parent  0af29fd7072d0dfc5db2afdd9a3d91f24279dbf5
*** empty log message ***

diff -r 0af29fd7072d -r 56bff1d567d6 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 29 12:25:27 2001 +0000
+++ b/lisp/ChangeLog	Mon Oct 29 12:25:58 2001 +0000
@@ -1,5 +1,8 @@
 2001-10-29  Gerd Moellmann  <gerd@gnu.org>
 
+	* enriched.el (enriched-face-ans): Handle face attributes
+	of the form `(FACE1 FACE2 ...)'.
+
 	* dired-x.el (dired-omit-startup): Show ``Omit'' only in Dired
 	buffers.
 
diff -r 0af29fd7072d -r 56bff1d567d6 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 29 12:25:27 2001 +0000
+++ b/src/ChangeLog	Mon Oct 29 12:25:58 2001 +0000
@@ -1,5 +1,8 @@
 2001-10-29  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (Fface_font): Use UNSPECIFIEDP instead of NILP for
+	the slant attribute if FRAME is t.
+
 	* xfns.c (x_set_internal_border_width): Set frame garbaged
 	when X window doesn't exist yet.