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, 3 insertions, 0 deletions

diff --git a/src/mac.c b/src/mac.c
index adf1dff3157..c7a9cd35f28 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #undef free
 #undef malloc
 #undef realloc
+#undef init_process
 #include <Carbon/Carbon.h>
 #undef free
 #define free unexec_free
@@ -47,6 +48,8 @@ Boston, MA 02111-1307, USA.  */
 #define malloc unexec_malloc
 #undef realloc
 #define realloc unexec_realloc
+#undef init_process
+#define init_process emacs_init_process
 #else /* not MAC_OSX */
 #include <Files.h>
 #include <MacTypes.h>