From f00691a3e4e5b7997ee7efe6e745d1158a439b21 Mon Sep 17 00:00:00 2001 From: Andrew Choi Date: Sun, 16 Jun 2002 23:08:57 +0000 Subject: [PATCH] In src/: 2002-06-16 Andrew Choi * 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 * term/mac-win.el (scalable-fonts-allowed): Set to t. --- lisp/ChangeLog | 6 +- lisp/term/mac-win.el | 6 ++ src/ChangeLog | 178 ++++++++++++++++++++++++------------------- src/fontset.c | 2 +- src/mac.c | 3 + src/macfns.c | 7 +- src/macmenu.c | 3 + src/macterm.c | 70 ++++++++++++----- src/s/darwin.h | 7 ++ src/xfaces.c | 26 ++++--- 10 files changed, 194 insertions(+), 114 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 + + * term/mac-win.el (scalable-fonts-allowed): Set to t. + 2002-06-15 Colin Walters * 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 +2002-06-05 Pavel Jan,Am(Bk * 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) ;; diff --git a/src/ChangeLog b/src/ChangeLog index 230fbb2c136..65f0025f57a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,27 @@ +2002-06-16 Andrew Choi + + * 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. + 2002-06-16 Eli Zaretskii * strftime.c [__hpux]: Include sys/_mbstate_t.h. @@ -25,7 +49,7 @@ * w32.c (init_environment): Remove EMACSLOCKDIR. (stat): Swap _S_IFDIR and _S_IFREG. -2002-06-13 Pavel Jan,Bm(Bk +2002-06-13 Pavel Jan,Am(Bk * keyboard.c, macterm.c, macmenu.c, msdos.c, sysdep.c * termhooks.h, xmenu.c, xsmfns.c, xterm.h, xterm.c, w32term.c, @@ -45,7 +69,7 @@ DRAG_N_DROP_EVENT, save_session_event to SAVE_SESSION_EVENT and no_event to NO_EVENT. -2002-06-12 Pavel Jan,Bm(Bk +2002-06-12 Pavel Jan,Am(Bk * macmenu.c: Remove declaration of Qmouse_click and Qevent_kind. @@ -134,7 +158,7 @@ * window.c (Fset_window_hscroll): Doc fix. -2002-06-05 Pavel Jan,Bm(Bk +2002-06-05 Pavel Jan,Am(Bk * fileio.c (choose_write_coding_system): Call select-safe-coding-system properly. @@ -493,7 +517,7 @@ type if comes from the Lisp object's car. If the selection contains a pure ASCII text, always return QSTRING as its type. -2002-05-06 Pavel Jan,Bm(Bk +2002-05-06 Pavel Jan,Am(Bk * mac.c (mac-cut-function): Doc fix. @@ -572,7 +596,7 @@ * xterm.c (XTread_socket): Disable the Xutf8LookupString code. -2002-04-29 Pavel Jan,Bm(Bk +2002-04-29 Pavel Jan,Am(Bk * dispextern.h (DEFAULT_TOOL_BAR_BUTTON_MARGIN) (DEFAULT_TOOL_BAR_BUTTON_RELIEF): Change default values. @@ -637,7 +661,7 @@ cursor on a stretch glyph has a width that depends on x_stretch_cursor_p. -2002-04-25 Pavel Jan,Bm(Bk +2002-04-25 Pavel Jan,Am(Bk * abbrev.c (abbrev-start-location): Doc fix. @@ -682,7 +706,7 @@ * xfns.c (x_set_mouse_color): Change default for cross_cursor to XC_hand2. -2002-04-23 Pavel Jan,Bm(Bk +2002-04-23 Pavel Jan,Am(Bk * xdisp.c: Remove unused global variable `minibuf_prompt_pixel_width'. @@ -697,11 +721,11 @@ * window.c (make_window): Initialize height_fixed_p, last_cursor_off_p, and p->cursor_off_p slots. -2002-04-20 Pavel Jan,Bm(Bk +2002-04-20 Pavel Jan,Am(Bk * fns.c (use-dialog-box): Doc fix. -2002-04-19 Pavel Jan,Bm(Bk +2002-04-19 Pavel Jan,Am(Bk * xterm.c (note_mode_line_or_margin_highlight): Remove unused variables `row', `i' and `area'. @@ -821,7 +845,7 @@ s/sco5.h, s/unixware.h: Don't set HAVE_ALLOCA, C_ALLOCA and STACK_DIRECTION, now set by autoconf. -2002-04-14 Pavel Jan,Bm(Bk +2002-04-14 Pavel Jan,Am(Bk * dispnew.c (marginal_area_string): Sort arguments. @@ -880,7 +904,7 @@ Use a single event for HELP_EVENT. (Fexecute_extended_command): Save last_point_position. -2002-04-12 Pavel Jan,Bm(Bk +2002-04-12 Pavel Jan,Am(Bk * lisp.h (Fpropertize): Add prototype. @@ -925,7 +949,7 @@ * callint.c (Fcall_interactively): Use INTEGERP instead of NUMBERP for checking Vhistory_length. -2002-04-05 Pavel Jan,Bm(Bk +2002-04-05 Pavel Jan,Am(Bk * sound.c (Fplay_sound_internal): Renamed from Fplay_sound. Doc fix to reflect it. @@ -958,7 +982,7 @@ * msdos.c (syms_of_msdos): Fix last change with mouse_autoselect_window. -2002-04-03 Pavel Jan,Bm(Bk +2002-04-03 Pavel Jan,Am(Bk * w32term.c, xterm.c, msdos.c: Rename autoselect_window_p to mouse_autoselect_window. @@ -1006,7 +1030,7 @@ (Fset_network_process_options, server_accept_connection): Fix some int/Lisp_Object confusions (thank you union types). -2002-04-01 Pavel Jan,Bm(Bk +2002-04-01 Pavel Jan,Am(Bk * msdos.c: Rename x_autoselect_window_p to autoselect_window_p. @@ -1065,7 +1089,7 @@ * process.c (DATAGRAM_CONN_P): Make sure PROC is really a process. -2002-03-27 Pavel Jan,Bm(Bk +2002-03-27 Pavel Jan,Am(Bk * process.c (set-network-process-options): Add usage. (make-network-process): Doc fix. @@ -1243,7 +1267,7 @@ use "sun" as a variable, it's a predefined constant on Sun machines. -2002-03-20 Pavel Jan,Bm(Bk +2002-03-20 Pavel Jan,Am(Bk * bytecode.c (Fbyte_code): Revert last change. @@ -1252,7 +1276,7 @@ * makefile.w32-in (LIBS): Add $(WSOCK32). From David Ponce . -2002-03-18 Pavel Jan,Bm(Bk +2002-03-18 Pavel Jan,Am(Bk * process.c (wait_reading_process_input): Move variables `pname' and `pnamelen' down where they are used. @@ -1271,7 +1295,7 @@ * process.c: Define HAVE_LOCAL_SOCKETS based on HAVE_SYS_UN_H. Remove explicit GNU_LINUX settings for datagram support. -2002-03-18 Pavel Jan,Bm(Bk +2002-03-18 Pavel Jan,Am(Bk * process.c (Fmake_network_process): Remove unused variable `sa'. Doc fix. Add usage:. @@ -1373,7 +1397,7 @@ * msdos.c (dos_rawgetc): Disable the x-autoselect-window feature, until its implementation is fixed. -2002-03-14 Pavel Jan,Bm(Bk +2002-03-14 Pavel Jan,Am(Bk * xfns.c (png_load): Remove unused variable `gamma_str'. @@ -1539,7 +1563,7 @@ * sysdep.c (sys_subshell) [MSDOS]: If PWD is set in the environment, pass it down with corrected value. -2002-03-04 Pavel Jan,Bm(Bk +2002-03-04 Pavel Jan,Am(Bk * lread.c (read_filtered_event): Do not call start_hourglass before returning. @@ -1680,7 +1704,7 @@ * w32proc.c (syms_of_ntproc): Doc fix. -2002-02-24 Pavel Jan,Bm(Bk +2002-02-24 Pavel Jan,Am(Bk * intervals.h: Include "dispextern.h" unconditionally. @@ -1736,7 +1760,7 @@ * w32fns.c (w32_wnd_proc) : Fix last change. -2002-02-23 Pavel Jan,Bm(Bk +2002-02-23 Pavel Jan,Am(Bk * w32term.c (enter_timestamp): Remove unused static variable to prevent warning. @@ -1812,7 +1836,7 @@ (tool_bar_items): Likewise. (current_active_maps): Removed unused (and buggy) function. -2002-02-20 Pavel Jan,Bm(Bk +2002-02-20 Pavel Jan,Am(Bk * xfns.c (gif_load): Use correct width and height for GIF images. @@ -1911,7 +1935,7 @@ (hscroll_window_tree): Use automatic_hscroll_margin and Vautomatic_hscroll_step to compute the amount of window scrolling. -2002-02-16 Pavel Jan,Bm(Bk +2002-02-16 Pavel Jan,Am(Bk * xterm.c (x-autoselect-window): New variable. (note_mouse_movement): Use it. @@ -2029,7 +2053,7 @@ * floatfns.c (Fround): Doc fix. -2002-02-08 Pavel Jan,Bm(Bk +2002-02-08 Pavel Jan,Am(Bk * sysdep.c (init_system_name): Put unused variable `p' in #if 0. @@ -2070,7 +2094,7 @@ (syms_of_keyboard): DEFVAR_LISP it. (command_loop_1): Set it, and perform command remapping. -2002-02-06 Pavel Jan,Bm(Bk +2002-02-06 Pavel Jan,Am(Bk * keyboard.c (recursive_edit_1): Call cancel_hourglass unconditionally. @@ -2110,7 +2134,7 @@ of the default face to Qnormal, unless these attributes are unspecified. -2002-02-02 Pavel Jan,Bm(Bk +2002-02-02 Pavel Jan,Am(Bk * keyboard.c (command_loop_1) [HAVE_X_WINDOWS]: Call cancel_hourglass unconditionally. @@ -2132,7 +2156,7 @@ * minibuf.c (Fcompleting_read): Doc fix. -2002-01-27 Pavel Jan,Bm(Bk +2002-01-27 Pavel Jan,Am(Bk * minibuf.c (Fread_from_minibuffer, Fread_command, Fread_function) (Fread_variable, Fread_buffer, minibuffer-completion-confirm): @@ -2145,7 +2169,7 @@ * xdisp.c (try_scrolling): Exchange uses of scroll_down_aggressively and scroll_up_aggressively. -2002-01-26 Pavel Jan,Bm(Bk +2002-01-26 Pavel Jan,Am(Bk * keyboard.c (parse_tool_bar_item): Remove duplicated prototypes. @@ -2200,7 +2224,7 @@ * xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust if fullscreen is being set. -2002-01-21 Pavel Jan,Bm(Bk +2002-01-21 Pavel Jan,Am(Bk * minibuf.c (Fminibuffer_contents) (Fminibuffer_contents_no_properties, Fread_from_minibuffer) @@ -2240,7 +2264,7 @@ * window.c (MIN_SAFE_WINDOW_HEIGHT): Value now 1. -2002-01-20 Pavel Jan,Bm(Bk +2002-01-20 Pavel Jan,Am(Bk * doprnt.c (doprnt1): Fix typos in error call. @@ -2266,7 +2290,7 @@ (w32_enable_synthesized_fonts): Change to a boolean. (Fw32_send_sys_command): Doc fix. -2002-01-19 Pavel Jan,Bm(Bk +2002-01-19 Pavel Jan,Am(Bk * dispnew.c (update_frame): Move the variable `tem' to the block where it is used. @@ -2286,7 +2310,7 @@ * window.c (enlarge_window): When exceeding size of parent, directly delete all the siblings instead of trying to resize it. -2002-01-17 Pavel Jan,Bm(Bk +2002-01-17 Pavel Jan,Am(Bk * term.c (set_tty_color_mode): Remove unused variable `tem'. @@ -2302,7 +2326,7 @@ * w32term.c (x_erase_phys_cursor): Ditto. -2002-01-16 Pavel Jan,Bm(Bk +2002-01-16 Pavel Jan,Am(Bk * xterm.c (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of `dont_resize' only when used. @@ -2314,12 +2338,12 @@ * xdisp.c (display_mode_element): When computing charpos, depend on multibyteness of elt, not the text in field. -2002-01-15 Pavel Jan,Bm(Bk +2002-01-15 Pavel Jan,Am(Bk * buffer.c (Fkill_all_local_variables): Increment `update_mode_lines' only once. -2002-01-14 Pavel Jan,Bm(Bk +2002-01-14 Pavel Jan,Am(Bk * lisp.h (adjust_after_replace_noundo) (Fupdate_coding_systems_internal): Add prototypes. @@ -2388,7 +2412,7 @@ (syms_of_w32fns): DEFVAR_BOOL it. (w32_wnd_proc): Handle new "XBUTTON" messages. -2002-01-13 Pavel Jan,Bm(Bk +2002-01-13 Pavel Jan,Am(Bk * keyboard.c (read_key_sequence): Remove unused variable `extra_maps'. @@ -2492,7 +2516,7 @@ * editfns.c (Fformat): Update thissize from field_width based on the actual width, in the string case. -2002-01-01 Pavel Jan,Bm(Bk +2002-01-01 Pavel Jan,Am(Bk * charset.h (UNIBYTE_STR_AS_MULTIBYTE_P): Parenthesize assignment when used as truth value to prevent gcc warnings. @@ -2605,7 +2629,7 @@ * bytecode.c (Fbyte_code): Use Fstring_make_unibyte instead of Fstring_as_unibyte. -2001-12-22 Pavel Jan,Bm(Bk +2001-12-22 Pavel Jan,Am(Bk The following changes remove mocklisp support: @@ -2678,7 +2702,7 @@ * Makefile.in (lisp, shortlisp): Synchronize with changes to lisp/Makefile.in:DONTCOMPILE. -2001-12-18 Pavel Jan,Bm(Bk +2001-12-18 Pavel Jan,Am(Bk * xdisp.c (window_box_height): Do not return negative values. From Gerd Moellmann . @@ -2775,7 +2799,7 @@ * s/gnu-linux.h (GNU_LINUX): Defined. -2001-12-11 Pavel Jan,Bm(Bk +2001-12-11 Pavel Jan,Am(Bk * macros.c, msdos.c, w16select.c: Change doc-string comments to `new style' [w/`doc:' keyword]. @@ -2785,7 +2809,7 @@ * w32menu.c (w32_free_submenu_strings): Clear menu item struct before using. -2001-12-09 Pavel Jan,Bm(Bk +2001-12-09 Pavel Jan,Am(Bk * dosfns.c: Change doc-string comments to `new style' [w/`doc:' keyword]. @@ -2806,7 +2830,7 @@ Lisp_Object. (w32_free_submenu_strings): Only free owner-drawn strings. -2001-12-09 Pavel Jan,Bm(Bk +2001-12-09 Pavel Jan,Am(Bk * COPYING: Moved back. @@ -2905,11 +2929,11 @@ * eval.c: Use standard syntax for usage in docstrings. -2001-12-03 Pavel Jan,Bm(Bk +2001-12-03 Pavel Jan,Am(Bk * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option. -2001-12-02 Pavel Jan,Bm(Bk +2001-12-02 Pavel Jan,Am(Bk * xterm.c (x_draw_image_relief): Use predefined macro instead of constant when the value of `tool_bar_button_relief' is negative. @@ -3005,7 +3029,7 @@ * w32term.c: Merged changes from xterm.c. * w32fns.c: Merged changes from xfns.c. -2001-11-29 Pavel Jan,Bm(Bk +2001-11-29 Pavel Jan,Am(Bk * COPYING: Removed. @@ -3015,7 +3039,7 @@ extra extra slot. (detect_coding_mask): Fix call of detect_coding_iso2022. -2001-11-29 Pavel Jan,Bm(Bk +2001-11-29 Pavel Jan,Am(Bk * fileio.c (file-name-coding-system) (default-file-name-coding-system): Doc fix (links to referenced @@ -3062,7 +3086,7 @@ * xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if OVERLAPS_P. -2001-11-28 Pavel Jan,Bm(Bk +2001-11-28 Pavel Jan,Am(Bk * xdisp.c (message_dolog): Remove unused variables `gcpro2', `gcpro3' and `gcpro4'. @@ -3179,7 +3203,7 @@ * msdos.c (IT_clear_screen): If the frame's faces are not yet realized, use the initial screen colors to clear the screen. -2001-11-23 Pavel Jan,Bm(Bk +2001-11-23 Pavel Jan,Am(Bk * textprop.c (Fset_text_properties): Remove unused variables `unchanged', `prev_changed', `s' and `len'. @@ -3307,7 +3331,7 @@ * puresize.h (BASE_PURESIZE): Increase to 750000. -2001-11-18 Pavel Jan,Bm(Bk +2001-11-18 Pavel Jan,Am(Bk * frame.c (Fframe_live_p): Doc fix. @@ -3357,7 +3381,7 @@ (Fwrite_region): Split the call to build_annotations into two calls to build_annotations and build_annotations_2. -2001-11-16 Pavel Jan,Bm(Bk +2001-11-16 Pavel Jan,Am(Bk * sysdep.c (wait_for_kbd_input) [VMS]: Do not call clear_waiting_for_input with argument. @@ -3529,7 +3553,7 @@ * print.c (prin1, print): Doc fix. -2001-11-14 Pavel Jan,Bm(Bk +2001-11-14 Pavel Jan,Am(Bk * fontset.h: Remove declarations of variables `Vhighlight_wrong_size_font' and `Vclip_large_size_font'. @@ -3541,7 +3565,7 @@ * w32fns.c: Doc fix. -2001-11-13 Pavel Jan,Bm(Bk +2001-11-13 Pavel Jan,Am(Bk * xfaces.c (Fface_attributes_as_vector): Doc fix. @@ -3571,7 +3595,7 @@ * w32fns.c: Don't define max. (Fx_open_connection): Only execute once. -2001-11-12 Pavel Jan,Bm(Bk +2001-11-12 Pavel Jan,Am(Bk * ccl.c: Change macros to use do-while block instead of if-else. Use braces to follow GNU Coding Standards. @@ -3609,7 +3633,7 @@ * unexelf.c (unexec): Use mmap/munmap to allocate buffers instead of malloc/free. -2001-11-09 Pavel Jan,Bm(Bk +2001-11-09 Pavel Jan,Am(Bk * xfaces.c (merge_face_vectors): Use braces to follow GNU Coding Standards. @@ -3628,7 +3652,7 @@ * w32term.c (x_display_and_set_cursor): Do not move system caret if cursor_glyph is NULL. -2001-11-07 Pavel Jan,Bm(Bk +2001-11-07 Pavel Jan,Am(Bk * keymap.c (access_keymap): Fix compilation error. @@ -3636,7 +3660,7 @@ * xfns.c (x_set_frame_parameters): Avoid infinite recursion. -2001-11-07 Pavel Jan,Bm(Bk +2001-11-07 Pavel Jan,Am(Bk * intervals.c (graft_intervals_into_buffer): Remove #ifdef'd-out code. @@ -3657,7 +3681,7 @@ * keyboard.c (make_lispy_event): Check integerness and fix Lisp_Object/int mixup. -2001-11-06 Pavel Jan,Bm(Bk +2001-11-06 Pavel Jan,Am(Bk * fns.c (copy_hash_table): Remove unused variable `v'. @@ -3695,7 +3719,7 @@ * unexelf.c (unexec): Don't use `mmap'. Instead, read and write the program image directly. -2001-11-05 Pavel Jan,Bm(Bk +2001-11-05 Pavel Jan,Am(Bk * buffer.h (Fbuffer_local_value): Add prototype. @@ -3731,7 +3755,7 @@ * xdisp.c (Qcursor_in_non_selected_windows): New variable. (syms_of_xdisp): Initialize it. -2001-11-04 Pavel Jan,Bm(Bk +2001-11-04 Pavel Jan,Am(Bk * xfns.c (Fx_create_frame): Doc fix. @@ -3765,7 +3789,7 @@ * syssignal.h (sigunblock): Don't define if already defined. -2001-11-02 Pavel Jan,Bm(Bk +2001-11-02 Pavel Jan,Am(Bk * eval.c (debugger_may_continue, Vdebug_ignored_errors) (call_debugger, Fcondition_case, skip_debugger, unbind_to): @@ -3818,7 +3842,7 @@ * textprop.c (Fget_char_property): Doc fix. -2001-11-02 Pavel Jan,Bm(Bk +2001-11-02 Pavel Jan,Am(Bk * process.c (Fstart_process): Add usage to doc-string. @@ -3841,7 +3865,7 @@ bindings along with or instead of the buffer local map. Make the overriding maps override what they should. -2001-11-01 Pavel Jan,Bm(Bk +2001-11-01 Pavel Jan,Am(Bk * window.c (grow_mini_window): Fix typo in comment. @@ -3862,7 +3886,7 @@ * s/hpux11.h: New file. -2001-10-31 Pavel Jan,Bm(Bk +2001-10-31 Pavel Jan,Am(Bk * emacs.c (USAGE1): Show command line option --no-window-system instead of --no-windows in usage. @@ -3888,7 +3912,7 @@ * dispextern.h (struct face) : New member. -2001-10-31 Pavel Jan,Bm(Bk +2001-10-31 Pavel Jan,Am(Bk * marker.c, mocklisp.c: Change doc-string comments to `new style' [w/`doc:' keyword]. @@ -3897,7 +3921,7 @@ * fns.c (require_unwind): Return Lisp_Object. -2001-10-31 Pavel Jan,Bm(Bk +2001-10-31 Pavel Jan,Am(Bk * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix. (last-input-char): Revert doc-string to be the same as the @@ -3991,7 +4015,7 @@ * window.c (Fscroll_left, Fscroll_right): Doc fix. -2001-10-29 Pavel Jan,Bm(Bk +2001-10-29 Pavel Jan,Am(Bk * keyboard.c (Finput_pending_p): Fix typo in doc-string. (echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it. @@ -4026,7 +4050,7 @@ * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing a loop counter. -2001-10-28 Pavel Jan,Bm(Bk +2001-10-28 Pavel Jan,Am(Bk * emacs.c: Use argv[0] instead of emacs when -t was specified. @@ -4066,7 +4090,7 @@ * w32term.c (note_mouse_highlight): Clear old help_echo. -2001-10-27 Pavel Jan,Bm(Bk +2001-10-27 Pavel Jan,Am(Bk * xterm.c: Fix typo in a comment. @@ -4153,12 +4177,12 @@ * xfaces.c (Fface_attributes_as_vector): New function. (syms_of_xfaces): Defsubr it. -2001-10-24 Pavel Jan,Bm(Bk +2001-10-24 Pavel Jan,Am(Bk * dispnew.c (sync_window_with_frame_matrix_rows): Remove unused variable `area'. -2001-10-25 Pavel Jan,Bm(Bk +2001-10-25 Pavel Jan,Am(Bk * search.c (scan_newline): Remove unused variable `selective_display'. @@ -4199,7 +4223,7 @@ * xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]: Fix clearing of area not covered by scroll bar. -2001-10-24 Pavel Jan,Bm(Bk +2001-10-24 Pavel Jan,Am(Bk * xterm.c: (x_insert_glyphs): Remove unused variables `real_end' and `real_start'. @@ -4226,7 +4250,7 @@ (try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited. (syms_of_xdisp) [GLYPH_DEBUG]: DEFVAR_BOOL the variables. -2001-10-24 Pavel Jan,Bm(Bk +2001-10-24 Pavel Jan,Am(Bk * xmenu.c: Spell the name of Emacs properly (GNU Emacs instead of gnuemacs). @@ -4279,7 +4303,7 @@ (x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p around call to x_draw_glyphs. -2001-10-23 Pavel Jan,Bm(Bk +2001-10-23 Pavel Jan,Am(Bk * syntax.c (modify-syntax-entry): Fix argument names (use CHAR instead of C) and usage. @@ -4300,7 +4324,7 @@ * xdisp.c (display_line): Fix computation of continuation lines width for TABs. -2001-10-22 Pavel Jan,Bm(Bk +2001-10-22 Pavel Jan,Am(Bk * xdisp.c (build_desired_tool_bar_string): Remove unused variable `Qlaplace'. @@ -4352,7 +4376,7 @@ * mocklisp.c (Finsert_string, Fml_if, Fml_provide_prefix_argument) (Fml_prefix_argument_loop): Likewise. -2001-10-21 Pavel Jan,Bm(Bk +2001-10-21 Pavel Jan,Am(Bk * fileio.c (Finsert_file_contents): Remove unused variable `gap_size'. @@ -4480,7 +4504,7 @@ * callproc.c (Fcall_process_region, Fcall_process): Likewise. * alloc.c (Fmake_byte_code, Fvector, Flist): Likewise. -2001-10-21 Pavel Jan,Bm(Bk +2001-10-21 Pavel Jan,Am(Bk * buffer.c: Reindent DEFUNs and DEFVARs with doc: keywords. diff --git a/src/fontset.c b/src/fontset.c index b79010e7bc2..f2df1c63774 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1413,7 +1413,7 @@ syms_of_fontset () #if defined (MAC_OS) FONTSET_ASCII (Vdefault_fontset) = Fcons (make_number (0), - build_string ("-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1")); + build_string ("-apple-monaco-medium-r-*--*-120-*-*-*-*-mac-roman")); #elif defined (WINDOWSNT) FONTSET_ASCII (Vdefault_fontset) = Fcons (make_number (0), 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 #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 #include 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 #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 #include #include @@ -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, diff --git a/src/macmenu.c b/src/macmenu.c index f98be4f4831..5976dad767d 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -46,6 +46,7 @@ Boston, MA 02111-1307, USA. */ precompiled header Carbon.h. */ #undef max #undef min +#undef init_process #include #undef Z #define Z (current_buffer->text->z) @@ -59,6 +60,8 @@ Boston, MA 02111-1307, USA. */ #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 #include diff --git a/src/macterm.c b/src/macterm.c index e25b4dc3b65..d98f24bc4fc 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -44,6 +44,7 @@ Boston, MA 02111-1307, USA. */ precompiled header Carbon.h. */ #undef max #undef min +#undef init_process #include #undef free #define free unexec_free @@ -55,6 +56,8 @@ Boston, MA 02111-1307, USA. */ #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 #include @@ -9559,6 +9562,13 @@ x_new_font (f, fontname) /* Now make the frame display the given font. */ if (FRAME_MAC_WINDOW (f) != 0) { + XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->normal_gc, + f->output_data.mac->font); + XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->reverse_gc, + f->output_data.mac->font); + XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->cursor_gc, + f->output_data.mac->font); + frame_update_line_height (f); if (NILP (tip_frame) || XFRAME (tip_frame) != f) x_set_window_size (f, 0, f->width, f->height); @@ -10651,10 +10661,30 @@ x_font_name_to_mac_font_name (char *xf, char *mf) } -/* Sets up the table font_name_table to contain the list of all - monospace fonts in the system the first time the table is used so - that the Resource Manager need not be accessed every time this - information is needed. */ +static void +add_font_name_table_entry (char *font_name) +{ + if (font_name_table_size == 0) + { + font_name_table_size = 16; + font_name_table = (char **) + xmalloc (font_name_table_size * sizeof (char *)); + } + else if (font_name_count + 1 >= font_name_table_size) + { + font_name_table_size += 16; + font_name_table = (char **) + xrealloc (font_name_table, + font_name_table_size * sizeof (char *)); + } + + font_name_table[font_name_count++] = font_name; +} + +/* Sets up the table font_name_table to contain the list of all fonts + in the system the first time the table is used so that the Resource + Manager need not be accessed every time this information is + needed. */ static void init_font_name_table () @@ -10700,23 +10730,21 @@ init_font_name_table () while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size) == noErr) - { - if (font_name_table_size == 0) - { - font_name_table_size = 16; - font_name_table = (char **) - xmalloc (font_name_table_size * sizeof (char *)); - } - else if (font_name_count + 1 >= font_name_table_size) - { - font_name_table_size += 16; - font_name_table = (char **) - xrealloc (font_name_table, - font_name_table_size * sizeof (char *)); - } - font_name_table[font_name_count++] - = mac_to_x_fontname (name, size, style, sc); - } + if (size == 0) + { + add_font_name_table_entry (mac_to_x_fontname (name, size, + style, sc)); + add_font_name_table_entry (mac_to_x_fontname (name, size, + italic, sc)); + add_font_name_table_entry (mac_to_x_fontname (name, size, + bold, sc)); + add_font_name_table_entry (mac_to_x_fontname (name, size, + italic | bold, + sc)); + } + else + add_font_name_table_entry (mac_to_x_fontname (name, size, style, + sc)); } /* Dispose of the iterators. */ diff --git a/src/s/darwin.h b/src/s/darwin.h index 214b55b4429..0d38ea5c196 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -253,6 +253,13 @@ Boston, MA 02111-1307, USA. */ #define C_SWITCH_SYSTEM_TEMACS -Dtemacs +/* The ncurses library has been moved out of the System framework in + Mac OS X 10.2. So if ./configure detects it, set the command-line + option to use it. */ +#ifdef HAVE_LIBNCURSES +#define LIBS_TERMCAP -lncurses +#endif + /* Link this program just by running cc. */ #define ORDINARY_LINK diff --git a/src/xfaces.c b/src/xfaces.c index 7d41a41a83b..fbac43205eb 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -917,6 +917,9 @@ init_frame_faces (f) #endif #ifdef WINDOWSNT if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) +#endif +#ifdef MAC_OS + if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) #endif if (!realize_basic_faces (f)) abort (); @@ -6337,6 +6340,17 @@ try_font_list (f, attrs, family, registry, fonts) if (STRINGP (face_family)) nfonts = try_alternative_families (f, face_family, registry, fonts); +#ifdef MAC_OS + /* When realizing the default face and a font spec does not matched + exactly, Emacs looks for ones with the same registry as the + default font. On the Mac, this is mac-roman, which does not work + if the family is -etl-fixed, e.g. The following widens the + choices and fixes that problem. */ + if (nfonts == 0 && STRINGP (face_family) && STRINGP (registry) + && xstricmp (XSTRING (registry)->data, "mac-roman") == 0) + nfonts = try_alternative_families (f, face_family, Qnil, fonts); +#endif + if (nfonts == 0 && !NILP (family)) nfonts = try_alternative_families (f, family, registry, fonts); @@ -6743,18 +6757,6 @@ realize_x_face (cache, attrs, c, base_face) fontset = default_face->fontset; face->fontset = make_fontset_for_ascii_face (f, fontset); face->font = NULL; /* to force realize_face to load font */ - -#ifdef MAC_OS - /* Load the font if it is specified in ATTRS. This fixes - changing frame font on the Mac. */ - if (STRINGP (attrs[LFACE_FONT_INDEX])) - { - struct font_info *font_info = - FS_LOAD_FONT (f, 0, XSTRING (attrs[LFACE_FONT_INDEX])->data, -1); - if (font_info) - face->font = font_info->font; - } -#endif } /* Load colors, and set remaining attributes. */ -- 2.39.2