Mercurial > emacs

diff src/macmenu.c @ 45848:39cdf9669519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Andrew Choi <akochoi@shaw.ca>
date Sun, 16 Jun 2002 23:08:57 +0000
parents 4b23b784713d
children 1fb8f75062c6
line wrap: on
line diff
--- a/src/macmenu.c	Sun Jun 16 17:31:12 2002 +0000
+++ b/src/macmenu.c	Sun Jun 16 23:08:57 2002 +0000
@@ -46,6 +46,7 @@
    precompiled header Carbon.h.  */
 #undef max
 #undef min
+#undef init_process
 #include <Carbon/Carbon.h>
 #undef Z
 #define Z (current_buffer->text->z)
@@ -59,6 +60,8 @@
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #undef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
+#undef init_process
+#define init_process emacs_init_process
 #else /* not MAC_OSX */
 #include <MacTypes.h>
 #include <Menus.h>