# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1129883234 0
# Node ID e74ff0edf0712db97ff870d4521f06f7eb14498b
# Parent  737f713709affab6d5e04ba970af44b330799fd1
*** empty log message ***

diff -r 737f713709af -r e74ff0edf071 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 21 08:27:04 2005 +0000
+++ b/lisp/ChangeLog	Fri Oct 21 08:27:14 2005 +0000
@@ -1,3 +1,15 @@
+2005-10-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* cus-face.el (custom-declare-face): Make face from X resources
+	also on Mac.
+
+	* disp-table.el (standard-display-g1, standard-display-graphic):
+	Refuse to use string glyphs also on Mac.
+	(standard-display-european): Don't set terminal coding system also
+	on Mac.
+
+	* frame.el (display-screens): Use x-display-screens also on Mac.
+
 2005-10-21  Romain Francoise  <romain@orebokech.com>
 
 	* net/rcirc.el: Now part of GNU Emacs.  Update FSF's address.