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.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f356d4c4e5..236fc1ff021 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-16  Andrew Choi  <akochoi@shaw.ca>
+
+        * term/mac-win.el (scalable-fonts-allowed): Set to t.
+
 2002-06-15  Colin Walters  <walters@debian.org>
 
         * pcvs-info.el (global-font-lock-mode, font-lock-auto-fontify):
@@ -294,7 +298,7 @@
         * select.el (xselect-convert-to-string): If VALUE is a string,
         return a cons of TYPE and the string.
 
-2002-06-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-06-05  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * language/cyrillic.el (cyrillic-alternativnyj-decode-table):
         Fix the table to contain correct characters.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 53f6cde1d79..c4030a86879 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -225,6 +225,12 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; ange-ftp will not work without it.
 (setq process-connection-type nil)
 
+;; Assume that fonts are always scalable on the Mac.  This sometimes
+;; results in characters with jagged edges.  However, without it,
+;; fonts with both truetype and bitmap representations but no italic
+;; or bold bitmap versions will not display these variants correctly.
+(setq scalable-fonts-allowed t)
+
 ;; (prefer-coding-system 'mac-roman)
 
 ;;