2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbd8b74ec3c..18f785b2c15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/frame.el b/lisp/frame.el
index bd4d7ad5288..46e6e742d7c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1053,9 +1053,9 @@ frame's display)."
   "Return the number of screens associated with DISPLAY."
   (let ((frame-type (framep-on-display display)))
     (cond
-     ((memq frame-type '(x w32))
+     ((memq frame-type '(x w32 mac))
       (x-display-screens display))
-     (t ;; FIXME: is this correct for the Mac?
+     (t
       1))))
 
 (defun display-pixel-height (&optional display)