In src/:

2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of
        Vdefault_fontset to Monaco with mac-roman coding.

        * mac.c, macfns.c, macmenu.c, macterm.c: Undefine and redefine
        init_process before and after inclusion of Carbon/Carbon.h, resp.

        * macterm.c (x_new_font): Set font for normal_gc, reverse_gc, and
        cursor_gc.
        (add_font_name_table_entry): New function.
        (init_font_name_table): Use add_font_name_table_entry; add italic,
        bold, and bold-italic entries for truetype fonts.

        * xfaces.c (init_frame_faces) [MAC_OS]: Call realize_basic_faces
        for Mac too.
        (try_font_list) [MAC_OS]: If no font matches given registry, try
        fonts with any registry matching face_family.
        (realize_x_face) [MAC_OS]: Remove old ad-hoc fix to load font
        here.

        * s/darwin.h: If autoconf detects the Ncurses library, define
        LIBS_TERMCAP to -lncurses to use it.

In lisp/:

2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el (scalable-fonts-allowed): Set to t.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/macfns.c b/src/macfns.c
index 9571c53a760..b51b46569f4 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -72,6 +72,7 @@ static unsigned char gray_bits[] = {
    precompiled header Carbon.h.  */
 #undef max
 #undef min
+#undef init_process
 #include <Carbon/Carbon.h>
 #undef Z
 #define Z (current_buffer->text->z)
@@ -85,7 +86,9 @@ static unsigned char gray_bits[] = {
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #undef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
-#else /* not MAC_OSX */ 
+#undef
+#define init_process emacs_init_process
+#else /* not MAC_OSX */
 #include <Windows.h>
 #include <Gestalt.h>
 #include <TextUtils.h>
@@ -4434,7 +4437,7 @@ If omitted or nil, that stands for the selected frame's display.  */)
     }
 #endif /* 0 */
 
-  error ("Display has an unknown visual class");
+  return (intern ("true-color"));
 }
 
 DEFUN ("x-display-save-under", Fx_display_save_under,