From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 11 May 2001 11:19:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.104~541
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bd2d083056ae6f24cafb0ddab13103937363c1c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4814f9228c..0e0cd3e0254 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index e988f44aa66..2ad1892a423 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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