term/mac-win.el: Use mac-standard-fontset-spec to create

fontset-mac
(mac-standard-fontset-spec): Created

2 files changed, 27 insertions, 6 deletions

diff --git a/lisp/ChangeLog.22 b/lisp/ChangeLog.22
index 2e38632e47d..7f43de02a1b 100644
--- a/lisp/ChangeLog.22
+++ b/lisp/ChangeLog.22
@@ -1,3 +1,9 @@
+2004-08-03  Steven Tamm  <steventamm@mac.com>
+
+        * term/mac-win.el: Use mac-standard-fontset-spec to create
+        fontset-mac
+        (mac-standard-fontset-spec): Created 
+
 2004-04-27  Kenichi Handa  <handa@m17n.org>
 
         * international/mule-diag.el (unicode-data): Call
@@ -484,7 +490,7 @@
         (utf-16-be-with-signature): Comment-out :endian.
 
         * mule-diag.el (describe-character-set): Fix
-        printing dimensions.  Use `$B!_(B', not `x'.
+        printing dimensions.  Use `,AW(B', not `x'.
 
 2003-04-12  Kenichi Handa  <handa@m17n.org>
 
@@ -954,7 +960,7 @@
 
 2002-09-05  Dave Love  <fx@gnu.org>
 
-        * international/characters.el: Make $(D*s(B and $(D+s(B a case pair.
+        * international/characters.el: Make ,_/(B and ,A(B a case pair.
 
 2002-09-03  Kenichi Handa  <handa@etl.go.jp>
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 15e813c53d3..eea8e95ce83 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -186,12 +186,27 @@ Switch to a buffer editing the last file dropped."
 ;; Create a fontset that uses mac-roman font.  With this fontset,
 ;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1,
 ;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font.
+;; Unnecessary in emacs22
+
+;; Carbon uses different fonts than commonly found on X, so
+;; we define our own standard fontset here.
+(defvar mac-standard-fontset-spec
+ "-apple-Monaco-normal-r-*-*-12-*-*-*-*-*-fontset-mac"
+ "String of fontset spec of the standard fontset.
+This defines a fontset consisting of the Monaco variations for
+European languages which are distributed with Mac OS X.
+
+See the documentation of `create-fontset-from-fontset-spec for the format.")
+
 
 (if (fboundp 'new-fontset)
-    (create-fontset-from-fontset-spec
-     "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-mac,
-ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman
-mac-roman:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman"))
+    (progn
+      (require 'fontset)
+      ;; Setup the default fontset.
+      (setup-default-fontset)
+      ;; Create the standard fontset.
+      (create-fontset-from-fontset-spec mac-standard-fontset-spec t)
+      ))
 
 
 (if (eq system-type 'darwin)