From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 4 Nov 2005 05:37:09 +0000 (+0000)
Subject: (command-line): Don't call tty-register-default-colors on Mac.
X-Git-Tag: emacs-pretest-22.0.90~6071
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51f47f643cb19decdd63e268b51f9b7fde40faa2;p=emacs.git

(command-line): Don't call tty-register-default-colors on Mac.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c033509e6b..84f90e1ce5a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,7 +4,8 @@
 	previous change.
 
 	* startup.el (command-line): Use `custom-reevaluate-setting' for
-	mouse-wheel-down-event and mouse-wheel-up-event.
+	mouse-wheel-down-event and mouse-wheel-up-event.  Don't call
+	tty-register-default-colors on Mac.
 
 2005-11-04  Nick Roberts  <nickrob@snap.net.nz>
 
diff --git a/lisp/startup.el b/lisp/startup.el
index d63e2b99962..5e135433a26 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -770,7 +770,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   ;; Register default TTY colors for the case the terminal hasn't a
   ;; terminal init file.
-  (unless (memq window-system '(x w32))
+  (unless (memq window-system '(x w32 mac))
     ;; We do this regardles of whether the terminal supports colors
     ;; or not, since they can switch that support on or off in
     ;; mid-session by setting the tty-color-mode frame parameter.