# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 989579990 0
# Node ID 2947eb80d57cadfdfac9a77e39bf6c54f1b5a3dc
# Parent  13efa6105da9b39998e483e0ef5bf08b0b4d66ac
*** empty log message ***

diff -r 13efa6105da9 -r 2947eb80d57c lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 11 11:19:19 2001 +0000
+++ b/lisp/ChangeLog	Fri May 11 11:19:50 2001 +0000
@@ -1,3 +1,8 @@
+2001-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+	* Makefile.in (compile-files): Redirect output of chmod to
+	/dev/null.
+
 2001-05-10  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* smerge-mode.el (smerge-mode): Force font-lock-multiline to t.
diff -r 13efa6105da9 -r 2947eb80d57c src/ChangeLog
--- a/src/ChangeLog	Fri May 11 11:19:19 2001 +0000
+++ b/src/ChangeLog	Fri May 11 11:19:50 2001 +0000
@@ -1,3 +1,11 @@
+2001-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfaces.c (try_alternative_families): New function.
+	(try_font_list): Use it.  If ATTRS specifies a family, check
+	fonts from that family first.
+	(choose_face_font): Remove code setting the family part of
+	the pattern to nil.
+
 2001-05-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* xdisp.c (try_window_id): Fix case of all changes before