diff options
| author | Andrew Choi | 2002-06-16 23:08:57 +0000 |
|---|---|---|
| committer | Andrew Choi | 2002-06-16 23:08:57 +0000 |
| commit | f00691a3e4e5b7997ee7efe6e745d1158a439b21 (patch) | |
| tree | 036f7ab41500e1da9f67cd9399a8589a78052e1d /src | |
| parent | 5fd4d15974c8437440a1b249feab59fb1fea5866 (diff) | |
| download | emacs-f00691a3e4e5b7997ee7efe6e745d1158a439b21.tar.gz emacs-f00691a3e4e5b7997ee7efe6e745d1158a439b21.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 178 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/mac.c | 3 | ||||
| -rw-r--r-- | src/macfns.c | 7 | ||||
| -rw-r--r-- | src/macmenu.c | 3 | ||||
| -rw-r--r-- | src/macterm.c | 70 | ||||
| -rw-r--r-- | src/s/darwin.h | 7 | ||||
| -rw-r--r-- | src/xfaces.c | 26 |
8 files changed, 183 insertions, 113 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 230fbb2c136..65f0025f57a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,27 @@ | |||
| 1 | 2002-06-16 Andrew Choi <akochoi@shaw.ca> | ||
| 2 | |||
| 3 | * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of | ||
| 4 | Vdefault_fontset to Monaco with mac-roman coding. | ||
| 5 | |||
| 6 | * mac.c, macfns.c, macmenu.c, macterm.c: Undefine and redefine | ||
| 7 | init_process before and after inclusion of Carbon/Carbon.h, resp. | ||
| 8 | |||
| 9 | * macterm.c (x_new_font): Set font for normal_gc, reverse_gc, and | ||
| 10 | cursor_gc. | ||
| 11 | (add_font_name_table_entry): New function. | ||
| 12 | (init_font_name_table): Use add_font_name_table_entry; add italic, | ||
| 13 | bold, and bold-italic entries for truetype fonts. | ||
| 14 | |||
| 15 | * xfaces.c (init_frame_faces) [MAC_OS]: Call realize_basic_faces | ||
| 16 | for Mac too. | ||
| 17 | (try_font_list) [MAC_OS]: If no font matches given registry, try | ||
| 18 | fonts with any registry matching face_family. | ||
| 19 | (realize_x_face) [MAC_OS]: Remove old ad-hoc fix to load font | ||
| 20 | here. | ||
| 21 | |||
| 22 | * s/darwin.h: If autoconf detects the Ncurses library, define | ||
| 23 | LIBS_TERMCAP to -lncurses to use it. | ||
| 24 | |||
| 1 | 2002-06-16 Eli Zaretskii <eliz@is.elta.co.il> | 25 | 2002-06-16 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 26 | ||
| 3 | * strftime.c [__hpux]: Include sys/_mbstate_t.h. | 27 | * strftime.c [__hpux]: Include sys/_mbstate_t.h. |
| @@ -25,7 +49,7 @@ | |||
| 25 | * w32.c (init_environment): Remove EMACSLOCKDIR. | 49 | * w32.c (init_environment): Remove EMACSLOCKDIR. |
| 26 | (stat): Swap _S_IFDIR and _S_IFREG. | 50 | (stat): Swap _S_IFDIR and _S_IFREG. |
| 27 | 51 | ||
| 28 | 2002-06-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 52 | 2002-06-13 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 29 | 53 | ||
| 30 | * keyboard.c, macterm.c, macmenu.c, msdos.c, sysdep.c | 54 | * keyboard.c, macterm.c, macmenu.c, msdos.c, sysdep.c |
| 31 | * termhooks.h, xmenu.c, xsmfns.c, xterm.h, xterm.c, w32term.c, | 55 | * termhooks.h, xmenu.c, xsmfns.c, xterm.h, xterm.c, w32term.c, |
| @@ -45,7 +69,7 @@ | |||
| 45 | DRAG_N_DROP_EVENT, save_session_event to SAVE_SESSION_EVENT and | 69 | DRAG_N_DROP_EVENT, save_session_event to SAVE_SESSION_EVENT and |
| 46 | no_event to NO_EVENT. | 70 | no_event to NO_EVENT. |
| 47 | 71 | ||
| 48 | 2002-06-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 72 | 2002-06-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 49 | 73 | ||
| 50 | * macmenu.c: Remove declaration of Qmouse_click and Qevent_kind. | 74 | * macmenu.c: Remove declaration of Qmouse_click and Qevent_kind. |
| 51 | 75 | ||
| @@ -134,7 +158,7 @@ | |||
| 134 | 158 | ||
| 135 | * window.c (Fset_window_hscroll): Doc fix. | 159 | * window.c (Fset_window_hscroll): Doc fix. |
| 136 | 160 | ||
| 137 | 2002-06-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 161 | 2002-06-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 138 | 162 | ||
| 139 | * fileio.c (choose_write_coding_system): | 163 | * fileio.c (choose_write_coding_system): |
| 140 | Call select-safe-coding-system properly. | 164 | Call select-safe-coding-system properly. |
| @@ -493,7 +517,7 @@ | |||
| 493 | type if comes from the Lisp object's car. If the selection | 517 | type if comes from the Lisp object's car. If the selection |
| 494 | contains a pure ASCII text, always return QSTRING as its type. | 518 | contains a pure ASCII text, always return QSTRING as its type. |
| 495 | 519 | ||
| 496 | 2002-05-06 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 520 | 2002-05-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 497 | 521 | ||
| 498 | * mac.c (mac-cut-function): Doc fix. | 522 | * mac.c (mac-cut-function): Doc fix. |
| 499 | 523 | ||
| @@ -572,7 +596,7 @@ | |||
| 572 | 596 | ||
| 573 | * xterm.c (XTread_socket): Disable the Xutf8LookupString code. | 597 | * xterm.c (XTread_socket): Disable the Xutf8LookupString code. |
| 574 | 598 | ||
| 575 | 2002-04-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 599 | 2002-04-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 576 | 600 | ||
| 577 | * dispextern.h (DEFAULT_TOOL_BAR_BUTTON_MARGIN) | 601 | * dispextern.h (DEFAULT_TOOL_BAR_BUTTON_MARGIN) |
| 578 | (DEFAULT_TOOL_BAR_BUTTON_RELIEF): Change default values. | 602 | (DEFAULT_TOOL_BAR_BUTTON_RELIEF): Change default values. |
| @@ -637,7 +661,7 @@ | |||
| 637 | cursor on a stretch glyph has a width that depends on | 661 | cursor on a stretch glyph has a width that depends on |
| 638 | x_stretch_cursor_p. | 662 | x_stretch_cursor_p. |
| 639 | 663 | ||
| 640 | 2002-04-25 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 664 | 2002-04-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 641 | 665 | ||
| 642 | * abbrev.c (abbrev-start-location): Doc fix. | 666 | * abbrev.c (abbrev-start-location): Doc fix. |
| 643 | 667 | ||
| @@ -682,7 +706,7 @@ | |||
| 682 | * xfns.c (x_set_mouse_color): Change default for cross_cursor | 706 | * xfns.c (x_set_mouse_color): Change default for cross_cursor |
| 683 | to XC_hand2. | 707 | to XC_hand2. |
| 684 | 708 | ||
| 685 | 2002-04-23 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 709 | 2002-04-23 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 686 | 710 | ||
| 687 | * xdisp.c: Remove unused global variable `minibuf_prompt_pixel_width'. | 711 | * xdisp.c: Remove unused global variable `minibuf_prompt_pixel_width'. |
| 688 | 712 | ||
| @@ -697,11 +721,11 @@ | |||
| 697 | * window.c (make_window): Initialize height_fixed_p, | 721 | * window.c (make_window): Initialize height_fixed_p, |
| 698 | last_cursor_off_p, and p->cursor_off_p slots. | 722 | last_cursor_off_p, and p->cursor_off_p slots. |
| 699 | 723 | ||
| 700 | 2002-04-20 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 724 | 2002-04-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 701 | 725 | ||
| 702 | * fns.c (use-dialog-box): Doc fix. | 726 | * fns.c (use-dialog-box): Doc fix. |
| 703 | 727 | ||
| 704 | 2002-04-19 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 728 | 2002-04-19 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 705 | 729 | ||
| 706 | * xterm.c (note_mode_line_or_margin_highlight): Remove unused | 730 | * xterm.c (note_mode_line_or_margin_highlight): Remove unused |
| 707 | variables `row', `i' and `area'. | 731 | variables `row', `i' and `area'. |
| @@ -821,7 +845,7 @@ | |||
| 821 | s/sco5.h, s/unixware.h: Don't set HAVE_ALLOCA, C_ALLOCA and | 845 | s/sco5.h, s/unixware.h: Don't set HAVE_ALLOCA, C_ALLOCA and |
| 822 | STACK_DIRECTION, now set by autoconf. | 846 | STACK_DIRECTION, now set by autoconf. |
| 823 | 847 | ||
| 824 | 2002-04-14 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 848 | 2002-04-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 825 | 849 | ||
| 826 | * dispnew.c (marginal_area_string): Sort arguments. | 850 | * dispnew.c (marginal_area_string): Sort arguments. |
| 827 | 851 | ||
| @@ -880,7 +904,7 @@ | |||
| 880 | Use a single event for HELP_EVENT. | 904 | Use a single event for HELP_EVENT. |
| 881 | (Fexecute_extended_command): Save last_point_position. | 905 | (Fexecute_extended_command): Save last_point_position. |
| 882 | 906 | ||
| 883 | 2002-04-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 907 | 2002-04-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 884 | 908 | ||
| 885 | * lisp.h (Fpropertize): Add prototype. | 909 | * lisp.h (Fpropertize): Add prototype. |
| 886 | 910 | ||
| @@ -925,7 +949,7 @@ | |||
| 925 | * callint.c (Fcall_interactively): Use INTEGERP instead of | 949 | * callint.c (Fcall_interactively): Use INTEGERP instead of |
| 926 | NUMBERP for checking Vhistory_length. | 950 | NUMBERP for checking Vhistory_length. |
| 927 | 951 | ||
| 928 | 2002-04-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 952 | 2002-04-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 929 | 953 | ||
| 930 | * sound.c (Fplay_sound_internal): Renamed from Fplay_sound. | 954 | * sound.c (Fplay_sound_internal): Renamed from Fplay_sound. |
| 931 | Doc fix to reflect it. | 955 | Doc fix to reflect it. |
| @@ -958,7 +982,7 @@ | |||
| 958 | * msdos.c (syms_of_msdos): Fix last change with | 982 | * msdos.c (syms_of_msdos): Fix last change with |
| 959 | mouse_autoselect_window. | 983 | mouse_autoselect_window. |
| 960 | 984 | ||
| 961 | 2002-04-03 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 985 | 2002-04-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 962 | 986 | ||
| 963 | * w32term.c, xterm.c, msdos.c: Rename autoselect_window_p to | 987 | * w32term.c, xterm.c, msdos.c: Rename autoselect_window_p to |
| 964 | mouse_autoselect_window. | 988 | mouse_autoselect_window. |
| @@ -1006,7 +1030,7 @@ | |||
| 1006 | (Fset_network_process_options, server_accept_connection): | 1030 | (Fset_network_process_options, server_accept_connection): |
| 1007 | Fix some int/Lisp_Object confusions (thank you union types). | 1031 | Fix some int/Lisp_Object confusions (thank you union types). |
| 1008 | 1032 | ||
| 1009 | 2002-04-01 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1033 | 2002-04-01 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1010 | 1034 | ||
| 1011 | * msdos.c: Rename x_autoselect_window_p to autoselect_window_p. | 1035 | * msdos.c: Rename x_autoselect_window_p to autoselect_window_p. |
| 1012 | 1036 | ||
| @@ -1065,7 +1089,7 @@ | |||
| 1065 | 1089 | ||
| 1066 | * process.c (DATAGRAM_CONN_P): Make sure PROC is really a process. | 1090 | * process.c (DATAGRAM_CONN_P): Make sure PROC is really a process. |
| 1067 | 1091 | ||
| 1068 | 2002-03-27 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1092 | 2002-03-27 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1069 | 1093 | ||
| 1070 | * process.c (set-network-process-options): Add usage. | 1094 | * process.c (set-network-process-options): Add usage. |
| 1071 | (make-network-process): Doc fix. | 1095 | (make-network-process): Doc fix. |
| @@ -1243,7 +1267,7 @@ | |||
| 1243 | use "sun" as a variable, it's a predefined constant on Sun | 1267 | use "sun" as a variable, it's a predefined constant on Sun |
| 1244 | machines. | 1268 | machines. |
| 1245 | 1269 | ||
| 1246 | 2002-03-20 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1270 | 2002-03-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1247 | 1271 | ||
| 1248 | * bytecode.c (Fbyte_code): Revert last change. | 1272 | * bytecode.c (Fbyte_code): Revert last change. |
| 1249 | 1273 | ||
| @@ -1252,7 +1276,7 @@ | |||
| 1252 | * makefile.w32-in (LIBS): Add $(WSOCK32). | 1276 | * makefile.w32-in (LIBS): Add $(WSOCK32). |
| 1253 | From David Ponce <dponce@voila.fr>. | 1277 | From David Ponce <dponce@voila.fr>. |
| 1254 | 1278 | ||
| 1255 | 2002-03-18 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1279 | 2002-03-18 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1256 | 1280 | ||
| 1257 | * process.c (wait_reading_process_input): Move variables `pname' | 1281 | * process.c (wait_reading_process_input): Move variables `pname' |
| 1258 | and `pnamelen' down where they are used. | 1282 | and `pnamelen' down where they are used. |
| @@ -1271,7 +1295,7 @@ | |||
| 1271 | * process.c: Define HAVE_LOCAL_SOCKETS based on HAVE_SYS_UN_H. | 1295 | * process.c: Define HAVE_LOCAL_SOCKETS based on HAVE_SYS_UN_H. |
| 1272 | Remove explicit GNU_LINUX settings for datagram support. | 1296 | Remove explicit GNU_LINUX settings for datagram support. |
| 1273 | 1297 | ||
| 1274 | 2002-03-18 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1298 | 2002-03-18 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1275 | 1299 | ||
| 1276 | * process.c (Fmake_network_process): Remove unused variable `sa'. | 1300 | * process.c (Fmake_network_process): Remove unused variable `sa'. |
| 1277 | Doc fix. Add usage:. | 1301 | Doc fix. Add usage:. |
| @@ -1373,7 +1397,7 @@ | |||
| 1373 | * msdos.c (dos_rawgetc): Disable the x-autoselect-window feature, | 1397 | * msdos.c (dos_rawgetc): Disable the x-autoselect-window feature, |
| 1374 | until its implementation is fixed. | 1398 | until its implementation is fixed. |
| 1375 | 1399 | ||
| 1376 | 2002-03-14 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1400 | 2002-03-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1377 | 1401 | ||
| 1378 | * xfns.c (png_load): Remove unused variable `gamma_str'. | 1402 | * xfns.c (png_load): Remove unused variable `gamma_str'. |
| 1379 | 1403 | ||
| @@ -1539,7 +1563,7 @@ | |||
| 1539 | * sysdep.c (sys_subshell) [MSDOS]: If PWD is set in the | 1563 | * sysdep.c (sys_subshell) [MSDOS]: If PWD is set in the |
| 1540 | environment, pass it down with corrected value. | 1564 | environment, pass it down with corrected value. |
| 1541 | 1565 | ||
| 1542 | 2002-03-04 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1566 | 2002-03-04 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1543 | 1567 | ||
| 1544 | * lread.c (read_filtered_event): Do not call start_hourglass | 1568 | * lread.c (read_filtered_event): Do not call start_hourglass |
| 1545 | before returning. | 1569 | before returning. |
| @@ -1680,7 +1704,7 @@ | |||
| 1680 | 1704 | ||
| 1681 | * w32proc.c (syms_of_ntproc): Doc fix. | 1705 | * w32proc.c (syms_of_ntproc): Doc fix. |
| 1682 | 1706 | ||
| 1683 | 2002-02-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1707 | 2002-02-24 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1684 | 1708 | ||
| 1685 | * intervals.h: Include "dispextern.h" unconditionally. | 1709 | * intervals.h: Include "dispextern.h" unconditionally. |
| 1686 | 1710 | ||
| @@ -1736,7 +1760,7 @@ | |||
| 1736 | 1760 | ||
| 1737 | * w32fns.c (w32_wnd_proc) <WM_TIMER>: Fix last change. | 1761 | * w32fns.c (w32_wnd_proc) <WM_TIMER>: Fix last change. |
| 1738 | 1762 | ||
| 1739 | 2002-02-23 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1763 | 2002-02-23 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1740 | 1764 | ||
| 1741 | * w32term.c (enter_timestamp): Remove unused static variable to | 1765 | * w32term.c (enter_timestamp): Remove unused static variable to |
| 1742 | prevent warning. | 1766 | prevent warning. |
| @@ -1812,7 +1836,7 @@ | |||
| 1812 | (tool_bar_items): Likewise. | 1836 | (tool_bar_items): Likewise. |
| 1813 | (current_active_maps): Removed unused (and buggy) function. | 1837 | (current_active_maps): Removed unused (and buggy) function. |
| 1814 | 1838 | ||
| 1815 | 2002-02-20 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1839 | 2002-02-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1816 | 1840 | ||
| 1817 | * xfns.c (gif_load): Use correct width and height for GIF images. | 1841 | * xfns.c (gif_load): Use correct width and height for GIF images. |
| 1818 | 1842 | ||
| @@ -1911,7 +1935,7 @@ | |||
| 1911 | (hscroll_window_tree): Use automatic_hscroll_margin and | 1935 | (hscroll_window_tree): Use automatic_hscroll_margin and |
| 1912 | Vautomatic_hscroll_step to compute the amount of window scrolling. | 1936 | Vautomatic_hscroll_step to compute the amount of window scrolling. |
| 1913 | 1937 | ||
| 1914 | 2002-02-16 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 1938 | 2002-02-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 1915 | 1939 | ||
| 1916 | * xterm.c (x-autoselect-window): New variable. | 1940 | * xterm.c (x-autoselect-window): New variable. |
| 1917 | (note_mouse_movement): Use it. | 1941 | (note_mouse_movement): Use it. |
| @@ -2029,7 +2053,7 @@ | |||
| 2029 | 2053 | ||
| 2030 | * floatfns.c (Fround): Doc fix. | 2054 | * floatfns.c (Fround): Doc fix. |
| 2031 | 2055 | ||
| 2032 | 2002-02-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2056 | 2002-02-08 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2033 | 2057 | ||
| 2034 | * sysdep.c (init_system_name): Put unused variable `p' in #if 0. | 2058 | * sysdep.c (init_system_name): Put unused variable `p' in #if 0. |
| 2035 | 2059 | ||
| @@ -2070,7 +2094,7 @@ | |||
| 2070 | (syms_of_keyboard): DEFVAR_LISP it. | 2094 | (syms_of_keyboard): DEFVAR_LISP it. |
| 2071 | (command_loop_1): Set it, and perform command remapping. | 2095 | (command_loop_1): Set it, and perform command remapping. |
| 2072 | 2096 | ||
| 2073 | 2002-02-06 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2097 | 2002-02-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2074 | 2098 | ||
| 2075 | * keyboard.c (recursive_edit_1): Call cancel_hourglass unconditionally. | 2099 | * keyboard.c (recursive_edit_1): Call cancel_hourglass unconditionally. |
| 2076 | 2100 | ||
| @@ -2110,7 +2134,7 @@ | |||
| 2110 | of the default face to Qnormal, unless these attributes are | 2134 | of the default face to Qnormal, unless these attributes are |
| 2111 | unspecified. | 2135 | unspecified. |
| 2112 | 2136 | ||
| 2113 | 2002-02-02 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2137 | 2002-02-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2114 | 2138 | ||
| 2115 | * keyboard.c (command_loop_1) [HAVE_X_WINDOWS]: | 2139 | * keyboard.c (command_loop_1) [HAVE_X_WINDOWS]: |
| 2116 | Call cancel_hourglass unconditionally. | 2140 | Call cancel_hourglass unconditionally. |
| @@ -2132,7 +2156,7 @@ | |||
| 2132 | 2156 | ||
| 2133 | * minibuf.c (Fcompleting_read): Doc fix. | 2157 | * minibuf.c (Fcompleting_read): Doc fix. |
| 2134 | 2158 | ||
| 2135 | 2002-01-27 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2159 | 2002-01-27 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2136 | 2160 | ||
| 2137 | * minibuf.c (Fread_from_minibuffer, Fread_command, Fread_function) | 2161 | * minibuf.c (Fread_from_minibuffer, Fread_command, Fread_function) |
| 2138 | (Fread_variable, Fread_buffer, minibuffer-completion-confirm): | 2162 | (Fread_variable, Fread_buffer, minibuffer-completion-confirm): |
| @@ -2145,7 +2169,7 @@ | |||
| 2145 | * xdisp.c (try_scrolling): Exchange uses of scroll_down_aggressively | 2169 | * xdisp.c (try_scrolling): Exchange uses of scroll_down_aggressively |
| 2146 | and scroll_up_aggressively. | 2170 | and scroll_up_aggressively. |
| 2147 | 2171 | ||
| 2148 | 2002-01-26 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2172 | 2002-01-26 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2149 | 2173 | ||
| 2150 | * keyboard.c (parse_tool_bar_item): Remove duplicated prototypes. | 2174 | * keyboard.c (parse_tool_bar_item): Remove duplicated prototypes. |
| 2151 | 2175 | ||
| @@ -2200,7 +2224,7 @@ | |||
| 2200 | * xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust | 2224 | * xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust |
| 2201 | if fullscreen is being set. | 2225 | if fullscreen is being set. |
| 2202 | 2226 | ||
| 2203 | 2002-01-21 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2227 | 2002-01-21 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2204 | 2228 | ||
| 2205 | * minibuf.c (Fminibuffer_contents) | 2229 | * minibuf.c (Fminibuffer_contents) |
| 2206 | (Fminibuffer_contents_no_properties, Fread_from_minibuffer) | 2230 | (Fminibuffer_contents_no_properties, Fread_from_minibuffer) |
| @@ -2240,7 +2264,7 @@ | |||
| 2240 | 2264 | ||
| 2241 | * window.c (MIN_SAFE_WINDOW_HEIGHT): Value now 1. | 2265 | * window.c (MIN_SAFE_WINDOW_HEIGHT): Value now 1. |
| 2242 | 2266 | ||
| 2243 | 2002-01-20 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2267 | 2002-01-20 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2244 | 2268 | ||
| 2245 | * doprnt.c (doprnt1): Fix typos in error call. | 2269 | * doprnt.c (doprnt1): Fix typos in error call. |
| 2246 | 2270 | ||
| @@ -2266,7 +2290,7 @@ | |||
| 2266 | (w32_enable_synthesized_fonts): Change to a boolean. | 2290 | (w32_enable_synthesized_fonts): Change to a boolean. |
| 2267 | (Fw32_send_sys_command): Doc fix. | 2291 | (Fw32_send_sys_command): Doc fix. |
| 2268 | 2292 | ||
| 2269 | 2002-01-19 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2293 | 2002-01-19 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2270 | 2294 | ||
| 2271 | * dispnew.c (update_frame): Move the variable `tem' to the block | 2295 | * dispnew.c (update_frame): Move the variable `tem' to the block |
| 2272 | where it is used. | 2296 | where it is used. |
| @@ -2286,7 +2310,7 @@ | |||
| 2286 | * window.c (enlarge_window): When exceeding size of parent, | 2310 | * window.c (enlarge_window): When exceeding size of parent, |
| 2287 | directly delete all the siblings instead of trying to resize it. | 2311 | directly delete all the siblings instead of trying to resize it. |
| 2288 | 2312 | ||
| 2289 | 2002-01-17 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2313 | 2002-01-17 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2290 | 2314 | ||
| 2291 | * term.c (set_tty_color_mode): Remove unused variable `tem'. | 2315 | * term.c (set_tty_color_mode): Remove unused variable `tem'. |
| 2292 | 2316 | ||
| @@ -2302,7 +2326,7 @@ | |||
| 2302 | 2326 | ||
| 2303 | * w32term.c (x_erase_phys_cursor): Ditto. | 2327 | * w32term.c (x_erase_phys_cursor): Ditto. |
| 2304 | 2328 | ||
| 2305 | 2002-01-16 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2329 | 2002-01-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2306 | 2330 | ||
| 2307 | * xterm.c (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of | 2331 | * xterm.c (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of |
| 2308 | `dont_resize' only when used. | 2332 | `dont_resize' only when used. |
| @@ -2314,12 +2338,12 @@ | |||
| 2314 | * xdisp.c (display_mode_element): When computing charpos, depend | 2338 | * xdisp.c (display_mode_element): When computing charpos, depend |
| 2315 | on multibyteness of elt, not the text in field. | 2339 | on multibyteness of elt, not the text in field. |
| 2316 | 2340 | ||
| 2317 | 2002-01-15 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2341 | 2002-01-15 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2318 | 2342 | ||
| 2319 | * buffer.c (Fkill_all_local_variables): | 2343 | * buffer.c (Fkill_all_local_variables): |
| 2320 | Increment `update_mode_lines' only once. | 2344 | Increment `update_mode_lines' only once. |
| 2321 | 2345 | ||
| 2322 | 2002-01-14 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2346 | 2002-01-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2323 | 2347 | ||
| 2324 | * lisp.h (adjust_after_replace_noundo) | 2348 | * lisp.h (adjust_after_replace_noundo) |
| 2325 | (Fupdate_coding_systems_internal): Add prototypes. | 2349 | (Fupdate_coding_systems_internal): Add prototypes. |
| @@ -2388,7 +2412,7 @@ | |||
| 2388 | (syms_of_w32fns): DEFVAR_BOOL it. | 2412 | (syms_of_w32fns): DEFVAR_BOOL it. |
| 2389 | (w32_wnd_proc): Handle new "XBUTTON" messages. | 2413 | (w32_wnd_proc): Handle new "XBUTTON" messages. |
| 2390 | 2414 | ||
| 2391 | 2002-01-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2415 | 2002-01-13 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2392 | 2416 | ||
| 2393 | * keyboard.c (read_key_sequence): Remove unused variable `extra_maps'. | 2417 | * keyboard.c (read_key_sequence): Remove unused variable `extra_maps'. |
| 2394 | 2418 | ||
| @@ -2492,7 +2516,7 @@ | |||
| 2492 | * editfns.c (Fformat): Update thissize from field_width | 2516 | * editfns.c (Fformat): Update thissize from field_width |
| 2493 | based on the actual width, in the string case. | 2517 | based on the actual width, in the string case. |
| 2494 | 2518 | ||
| 2495 | 2002-01-01 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2519 | 2002-01-01 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2496 | 2520 | ||
| 2497 | * charset.h (UNIBYTE_STR_AS_MULTIBYTE_P): Parenthesize assignment | 2521 | * charset.h (UNIBYTE_STR_AS_MULTIBYTE_P): Parenthesize assignment |
| 2498 | when used as truth value to prevent gcc warnings. | 2522 | when used as truth value to prevent gcc warnings. |
| @@ -2605,7 +2629,7 @@ | |||
| 2605 | * bytecode.c (Fbyte_code): Use Fstring_make_unibyte | 2629 | * bytecode.c (Fbyte_code): Use Fstring_make_unibyte |
| 2606 | instead of Fstring_as_unibyte. | 2630 | instead of Fstring_as_unibyte. |
| 2607 | 2631 | ||
| 2608 | 2001-12-22 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2632 | 2001-12-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2609 | 2633 | ||
| 2610 | The following changes remove mocklisp support: | 2634 | The following changes remove mocklisp support: |
| 2611 | 2635 | ||
| @@ -2678,7 +2702,7 @@ | |||
| 2678 | * Makefile.in (lisp, shortlisp): Synchronize with changes to | 2702 | * Makefile.in (lisp, shortlisp): Synchronize with changes to |
| 2679 | lisp/Makefile.in:DONTCOMPILE. | 2703 | lisp/Makefile.in:DONTCOMPILE. |
| 2680 | 2704 | ||
| 2681 | 2001-12-18 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2705 | 2001-12-18 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2682 | 2706 | ||
| 2683 | * xdisp.c (window_box_height): Do not return negative values. | 2707 | * xdisp.c (window_box_height): Do not return negative values. |
| 2684 | From Gerd Moellmann <gerd@gnu.org>. | 2708 | From Gerd Moellmann <gerd@gnu.org>. |
| @@ -2775,7 +2799,7 @@ | |||
| 2775 | 2799 | ||
| 2776 | * s/gnu-linux.h (GNU_LINUX): Defined. | 2800 | * s/gnu-linux.h (GNU_LINUX): Defined. |
| 2777 | 2801 | ||
| 2778 | 2001-12-11 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2802 | 2001-12-11 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2779 | 2803 | ||
| 2780 | * macros.c, msdos.c, w16select.c: Change doc-string comments to | 2804 | * macros.c, msdos.c, w16select.c: Change doc-string comments to |
| 2781 | `new style' [w/`doc:' keyword]. | 2805 | `new style' [w/`doc:' keyword]. |
| @@ -2785,7 +2809,7 @@ | |||
| 2785 | * w32menu.c (w32_free_submenu_strings): Clear menu item struct | 2809 | * w32menu.c (w32_free_submenu_strings): Clear menu item struct |
| 2786 | before using. | 2810 | before using. |
| 2787 | 2811 | ||
| 2788 | 2001-12-09 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2812 | 2001-12-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2789 | 2813 | ||
| 2790 | * dosfns.c: Change doc-string comments to `new style' [w/`doc:' | 2814 | * dosfns.c: Change doc-string comments to `new style' [w/`doc:' |
| 2791 | keyword]. | 2815 | keyword]. |
| @@ -2806,7 +2830,7 @@ | |||
| 2806 | Lisp_Object. | 2830 | Lisp_Object. |
| 2807 | (w32_free_submenu_strings): Only free owner-drawn strings. | 2831 | (w32_free_submenu_strings): Only free owner-drawn strings. |
| 2808 | 2832 | ||
| 2809 | 2001-12-09 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2833 | 2001-12-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2810 | 2834 | ||
| 2811 | * COPYING: Moved back. | 2835 | * COPYING: Moved back. |
| 2812 | 2836 | ||
| @@ -2905,11 +2929,11 @@ | |||
| 2905 | 2929 | ||
| 2906 | * eval.c: Use standard syntax for usage in docstrings. | 2930 | * eval.c: Use standard syntax for usage in docstrings. |
| 2907 | 2931 | ||
| 2908 | 2001-12-03 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2932 | 2001-12-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2909 | 2933 | ||
| 2910 | * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option. | 2934 | * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option. |
| 2911 | 2935 | ||
| 2912 | 2001-12-02 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 2936 | 2001-12-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 2913 | 2937 | ||
| 2914 | * xterm.c (x_draw_image_relief): Use predefined macro instead of | 2938 | * xterm.c (x_draw_image_relief): Use predefined macro instead of |
| 2915 | constant when the value of `tool_bar_button_relief' is negative. | 2939 | constant when the value of `tool_bar_button_relief' is negative. |
| @@ -3005,7 +3029,7 @@ | |||
| 3005 | * w32term.c: Merged changes from xterm.c. | 3029 | * w32term.c: Merged changes from xterm.c. |
| 3006 | * w32fns.c: Merged changes from xfns.c. | 3030 | * w32fns.c: Merged changes from xfns.c. |
| 3007 | 3031 | ||
| 3008 | 2001-11-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3032 | 2001-11-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3009 | 3033 | ||
| 3010 | * COPYING: Removed. | 3034 | * COPYING: Removed. |
| 3011 | 3035 | ||
| @@ -3015,7 +3039,7 @@ | |||
| 3015 | extra extra slot. | 3039 | extra extra slot. |
| 3016 | (detect_coding_mask): Fix call of detect_coding_iso2022. | 3040 | (detect_coding_mask): Fix call of detect_coding_iso2022. |
| 3017 | 3041 | ||
| 3018 | 2001-11-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3042 | 2001-11-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3019 | 3043 | ||
| 3020 | * fileio.c (file-name-coding-system) | 3044 | * fileio.c (file-name-coding-system) |
| 3021 | (default-file-name-coding-system): Doc fix (links to referenced | 3045 | (default-file-name-coding-system): Doc fix (links to referenced |
| @@ -3062,7 +3086,7 @@ | |||
| 3062 | * xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if | 3086 | * xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if |
| 3063 | OVERLAPS_P. | 3087 | OVERLAPS_P. |
| 3064 | 3088 | ||
| 3065 | 2001-11-28 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3089 | 2001-11-28 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3066 | 3090 | ||
| 3067 | * xdisp.c (message_dolog): Remove unused variables `gcpro2', | 3091 | * xdisp.c (message_dolog): Remove unused variables `gcpro2', |
| 3068 | `gcpro3' and `gcpro4'. | 3092 | `gcpro3' and `gcpro4'. |
| @@ -3179,7 +3203,7 @@ | |||
| 3179 | * msdos.c (IT_clear_screen): If the frame's faces are not yet | 3203 | * msdos.c (IT_clear_screen): If the frame's faces are not yet |
| 3180 | realized, use the initial screen colors to clear the screen. | 3204 | realized, use the initial screen colors to clear the screen. |
| 3181 | 3205 | ||
| 3182 | 2001-11-23 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3206 | 2001-11-23 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3183 | 3207 | ||
| 3184 | * textprop.c (Fset_text_properties): Remove unused variables | 3208 | * textprop.c (Fset_text_properties): Remove unused variables |
| 3185 | `unchanged', `prev_changed', `s' and `len'. | 3209 | `unchanged', `prev_changed', `s' and `len'. |
| @@ -3307,7 +3331,7 @@ | |||
| 3307 | 3331 | ||
| 3308 | * puresize.h (BASE_PURESIZE): Increase to 750000. | 3332 | * puresize.h (BASE_PURESIZE): Increase to 750000. |
| 3309 | 3333 | ||
| 3310 | 2001-11-18 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3334 | 2001-11-18 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3311 | 3335 | ||
| 3312 | * frame.c (Fframe_live_p): Doc fix. | 3336 | * frame.c (Fframe_live_p): Doc fix. |
| 3313 | 3337 | ||
| @@ -3357,7 +3381,7 @@ | |||
| 3357 | (Fwrite_region): Split the call to build_annotations into two | 3381 | (Fwrite_region): Split the call to build_annotations into two |
| 3358 | calls to build_annotations and build_annotations_2. | 3382 | calls to build_annotations and build_annotations_2. |
| 3359 | 3383 | ||
| 3360 | 2001-11-16 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3384 | 2001-11-16 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3361 | 3385 | ||
| 3362 | * sysdep.c (wait_for_kbd_input) [VMS]: Do not call | 3386 | * sysdep.c (wait_for_kbd_input) [VMS]: Do not call |
| 3363 | clear_waiting_for_input with argument. | 3387 | clear_waiting_for_input with argument. |
| @@ -3529,7 +3553,7 @@ | |||
| 3529 | 3553 | ||
| 3530 | * print.c (prin1, print): Doc fix. | 3554 | * print.c (prin1, print): Doc fix. |
| 3531 | 3555 | ||
| 3532 | 2001-11-14 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3556 | 2001-11-14 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3533 | 3557 | ||
| 3534 | * fontset.h: Remove declarations of variables | 3558 | * fontset.h: Remove declarations of variables |
| 3535 | `Vhighlight_wrong_size_font' and `Vclip_large_size_font'. | 3559 | `Vhighlight_wrong_size_font' and `Vclip_large_size_font'. |
| @@ -3541,7 +3565,7 @@ | |||
| 3541 | 3565 | ||
| 3542 | * w32fns.c: Doc fix. | 3566 | * w32fns.c: Doc fix. |
| 3543 | 3567 | ||
| 3544 | 2001-11-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3568 | 2001-11-13 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3545 | 3569 | ||
| 3546 | * xfaces.c (Fface_attributes_as_vector): Doc fix. | 3570 | * xfaces.c (Fface_attributes_as_vector): Doc fix. |
| 3547 | 3571 | ||
| @@ -3571,7 +3595,7 @@ | |||
| 3571 | * w32fns.c: Don't define max. | 3595 | * w32fns.c: Don't define max. |
| 3572 | (Fx_open_connection): Only execute once. | 3596 | (Fx_open_connection): Only execute once. |
| 3573 | 3597 | ||
| 3574 | 2001-11-12 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3598 | 2001-11-12 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3575 | 3599 | ||
| 3576 | * ccl.c: Change macros to use do-while block instead of if-else. | 3600 | * ccl.c: Change macros to use do-while block instead of if-else. |
| 3577 | Use braces to follow GNU Coding Standards. | 3601 | Use braces to follow GNU Coding Standards. |
| @@ -3609,7 +3633,7 @@ | |||
| 3609 | * unexelf.c (unexec): Use mmap/munmap to allocate buffers | 3633 | * unexelf.c (unexec): Use mmap/munmap to allocate buffers |
| 3610 | instead of malloc/free. | 3634 | instead of malloc/free. |
| 3611 | 3635 | ||
| 3612 | 2001-11-09 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3636 | 2001-11-09 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3613 | 3637 | ||
| 3614 | * xfaces.c (merge_face_vectors): Use braces to follow GNU | 3638 | * xfaces.c (merge_face_vectors): Use braces to follow GNU |
| 3615 | Coding Standards. | 3639 | Coding Standards. |
| @@ -3628,7 +3652,7 @@ | |||
| 3628 | * w32term.c (x_display_and_set_cursor): Do not move system caret | 3652 | * w32term.c (x_display_and_set_cursor): Do not move system caret |
| 3629 | if cursor_glyph is NULL. | 3653 | if cursor_glyph is NULL. |
| 3630 | 3654 | ||
| 3631 | 2001-11-07 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3655 | 2001-11-07 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3632 | 3656 | ||
| 3633 | * keymap.c (access_keymap): Fix compilation error. | 3657 | * keymap.c (access_keymap): Fix compilation error. |
| 3634 | 3658 | ||
| @@ -3636,7 +3660,7 @@ | |||
| 3636 | 3660 | ||
| 3637 | * xfns.c (x_set_frame_parameters): Avoid infinite recursion. | 3661 | * xfns.c (x_set_frame_parameters): Avoid infinite recursion. |
| 3638 | 3662 | ||
| 3639 | 2001-11-07 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3663 | 2001-11-07 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3640 | 3664 | ||
| 3641 | * intervals.c (graft_intervals_into_buffer): | 3665 | * intervals.c (graft_intervals_into_buffer): |
| 3642 | Remove #ifdef'd-out code. | 3666 | Remove #ifdef'd-out code. |
| @@ -3657,7 +3681,7 @@ | |||
| 3657 | * keyboard.c (make_lispy_event): Check integerness and fix | 3681 | * keyboard.c (make_lispy_event): Check integerness and fix |
| 3658 | Lisp_Object/int mixup. | 3682 | Lisp_Object/int mixup. |
| 3659 | 3683 | ||
| 3660 | 2001-11-06 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3684 | 2001-11-06 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3661 | 3685 | ||
| 3662 | * fns.c (copy_hash_table): Remove unused variable `v'. | 3686 | * fns.c (copy_hash_table): Remove unused variable `v'. |
| 3663 | 3687 | ||
| @@ -3695,7 +3719,7 @@ | |||
| 3695 | * unexelf.c (unexec): Don't use `mmap'. Instead, read and write | 3719 | * unexelf.c (unexec): Don't use `mmap'. Instead, read and write |
| 3696 | the program image directly. | 3720 | the program image directly. |
| 3697 | 3721 | ||
| 3698 | 2001-11-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3722 | 2001-11-05 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3699 | 3723 | ||
| 3700 | * buffer.h (Fbuffer_local_value): Add prototype. | 3724 | * buffer.h (Fbuffer_local_value): Add prototype. |
| 3701 | 3725 | ||
| @@ -3731,7 +3755,7 @@ | |||
| 3731 | * xdisp.c (Qcursor_in_non_selected_windows): New variable. | 3755 | * xdisp.c (Qcursor_in_non_selected_windows): New variable. |
| 3732 | (syms_of_xdisp): Initialize it. | 3756 | (syms_of_xdisp): Initialize it. |
| 3733 | 3757 | ||
| 3734 | 2001-11-04 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3758 | 2001-11-04 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3735 | 3759 | ||
| 3736 | * xfns.c (Fx_create_frame): Doc fix. | 3760 | * xfns.c (Fx_create_frame): Doc fix. |
| 3737 | 3761 | ||
| @@ -3765,7 +3789,7 @@ | |||
| 3765 | 3789 | ||
| 3766 | * syssignal.h (sigunblock): Don't define if already defined. | 3790 | * syssignal.h (sigunblock): Don't define if already defined. |
| 3767 | 3791 | ||
| 3768 | 2001-11-02 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3792 | 2001-11-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3769 | 3793 | ||
| 3770 | * eval.c (debugger_may_continue, Vdebug_ignored_errors) | 3794 | * eval.c (debugger_may_continue, Vdebug_ignored_errors) |
| 3771 | (call_debugger, Fcondition_case, skip_debugger, unbind_to): | 3795 | (call_debugger, Fcondition_case, skip_debugger, unbind_to): |
| @@ -3818,7 +3842,7 @@ | |||
| 3818 | 3842 | ||
| 3819 | * textprop.c (Fget_char_property): Doc fix. | 3843 | * textprop.c (Fget_char_property): Doc fix. |
| 3820 | 3844 | ||
| 3821 | 2001-11-02 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3845 | 2001-11-02 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3822 | 3846 | ||
| 3823 | * process.c (Fstart_process): Add usage to doc-string. | 3847 | * process.c (Fstart_process): Add usage to doc-string. |
| 3824 | 3848 | ||
| @@ -3841,7 +3865,7 @@ | |||
| 3841 | bindings along with or instead of the buffer local map. | 3865 | bindings along with or instead of the buffer local map. |
| 3842 | Make the overriding maps override what they should. | 3866 | Make the overriding maps override what they should. |
| 3843 | 3867 | ||
| 3844 | 2001-11-01 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3868 | 2001-11-01 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3845 | 3869 | ||
| 3846 | * window.c (grow_mini_window): Fix typo in comment. | 3870 | * window.c (grow_mini_window): Fix typo in comment. |
| 3847 | 3871 | ||
| @@ -3862,7 +3886,7 @@ | |||
| 3862 | 3886 | ||
| 3863 | * s/hpux11.h: New file. | 3887 | * s/hpux11.h: New file. |
| 3864 | 3888 | ||
| 3865 | 2001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3889 | 2001-10-31 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3866 | 3890 | ||
| 3867 | * emacs.c (USAGE1): Show command line option --no-window-system | 3891 | * emacs.c (USAGE1): Show command line option --no-window-system |
| 3868 | instead of --no-windows in usage. | 3892 | instead of --no-windows in usage. |
| @@ -3888,7 +3912,7 @@ | |||
| 3888 | 3912 | ||
| 3889 | * dispextern.h (struct face) <colors_copied_bitwise_p>: New member. | 3913 | * dispextern.h (struct face) <colors_copied_bitwise_p>: New member. |
| 3890 | 3914 | ||
| 3891 | 2001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3915 | 2001-10-31 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3892 | 3916 | ||
| 3893 | * marker.c, mocklisp.c: Change doc-string comments to `new style' | 3917 | * marker.c, mocklisp.c: Change doc-string comments to `new style' |
| 3894 | [w/`doc:' keyword]. | 3918 | [w/`doc:' keyword]. |
| @@ -3897,7 +3921,7 @@ | |||
| 3897 | 3921 | ||
| 3898 | * fns.c (require_unwind): Return Lisp_Object. | 3922 | * fns.c (require_unwind): Return Lisp_Object. |
| 3899 | 3923 | ||
| 3900 | 2001-10-31 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 3924 | 2001-10-31 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3901 | 3925 | ||
| 3902 | * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix. | 3926 | * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix. |
| 3903 | (last-input-char): Revert doc-string to be the same as the | 3927 | (last-input-char): Revert doc-string to be the same as the |
| @@ -3991,7 +4015,7 @@ | |||
| 3991 | 4015 | ||
| 3992 | * window.c (Fscroll_left, Fscroll_right): Doc fix. | 4016 | * window.c (Fscroll_left, Fscroll_right): Doc fix. |
| 3993 | 4017 | ||
| 3994 | 2001-10-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4018 | 2001-10-29 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 3995 | 4019 | ||
| 3996 | * keyboard.c (Finput_pending_p): Fix typo in doc-string. | 4020 | * keyboard.c (Finput_pending_p): Fix typo in doc-string. |
| 3997 | (echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it. | 4021 | (echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it. |
| @@ -4026,7 +4050,7 @@ | |||
| 4026 | * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing | 4050 | * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing |
| 4027 | a loop counter. | 4051 | a loop counter. |
| 4028 | 4052 | ||
| 4029 | 2001-10-28 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4053 | 2001-10-28 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4030 | 4054 | ||
| 4031 | * emacs.c: Use argv[0] instead of emacs when -t was specified. | 4055 | * emacs.c: Use argv[0] instead of emacs when -t was specified. |
| 4032 | 4056 | ||
| @@ -4066,7 +4090,7 @@ | |||
| 4066 | 4090 | ||
| 4067 | * w32term.c (note_mouse_highlight): Clear old help_echo. | 4091 | * w32term.c (note_mouse_highlight): Clear old help_echo. |
| 4068 | 4092 | ||
| 4069 | 2001-10-27 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4093 | 2001-10-27 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4070 | 4094 | ||
| 4071 | * xterm.c: Fix typo in a comment. | 4095 | * xterm.c: Fix typo in a comment. |
| 4072 | 4096 | ||
| @@ -4153,12 +4177,12 @@ | |||
| 4153 | * xfaces.c (Fface_attributes_as_vector): New function. | 4177 | * xfaces.c (Fface_attributes_as_vector): New function. |
| 4154 | (syms_of_xfaces): Defsubr it. | 4178 | (syms_of_xfaces): Defsubr it. |
| 4155 | 4179 | ||
| 4156 | 2001-10-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4180 | 2001-10-24 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4157 | 4181 | ||
| 4158 | * dispnew.c (sync_window_with_frame_matrix_rows): Remove unused | 4182 | * dispnew.c (sync_window_with_frame_matrix_rows): Remove unused |
| 4159 | variable `area'. | 4183 | variable `area'. |
| 4160 | 4184 | ||
| 4161 | 2001-10-25 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4185 | 2001-10-25 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4162 | 4186 | ||
| 4163 | * search.c (scan_newline): Remove unused variable `selective_display'. | 4187 | * search.c (scan_newline): Remove unused variable `selective_display'. |
| 4164 | 4188 | ||
| @@ -4199,7 +4223,7 @@ | |||
| 4199 | * xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]: | 4223 | * xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]: |
| 4200 | Fix clearing of area not covered by scroll bar. | 4224 | Fix clearing of area not covered by scroll bar. |
| 4201 | 4225 | ||
| 4202 | 2001-10-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4226 | 2001-10-24 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4203 | 4227 | ||
| 4204 | * xterm.c: (x_insert_glyphs): Remove unused variables `real_end' | 4228 | * xterm.c: (x_insert_glyphs): Remove unused variables `real_end' |
| 4205 | and `real_start'. | 4229 | and `real_start'. |
| @@ -4226,7 +4250,7 @@ | |||
| 4226 | (try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited. | 4250 | (try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited. |
| 4227 | (syms_of_xdisp) [GLYPH_DEBUG]: DEFVAR_BOOL the variables. | 4251 | (syms_of_xdisp) [GLYPH_DEBUG]: DEFVAR_BOOL the variables. |
| 4228 | 4252 | ||
| 4229 | 2001-10-24 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4253 | 2001-10-24 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4230 | 4254 | ||
| 4231 | * xmenu.c: Spell the name of Emacs properly (GNU Emacs instead of | 4255 | * xmenu.c: Spell the name of Emacs properly (GNU Emacs instead of |
| 4232 | gnuemacs). | 4256 | gnuemacs). |
| @@ -4279,7 +4303,7 @@ | |||
| 4279 | (x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p | 4303 | (x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p |
| 4280 | around call to x_draw_glyphs. | 4304 | around call to x_draw_glyphs. |
| 4281 | 4305 | ||
| 4282 | 2001-10-23 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4306 | 2001-10-23 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4283 | 4307 | ||
| 4284 | * syntax.c (modify-syntax-entry): Fix argument names (use CHAR | 4308 | * syntax.c (modify-syntax-entry): Fix argument names (use CHAR |
| 4285 | instead of C) and usage. | 4309 | instead of C) and usage. |
| @@ -4300,7 +4324,7 @@ | |||
| 4300 | * xdisp.c (display_line): Fix computation of continuation lines | 4324 | * xdisp.c (display_line): Fix computation of continuation lines |
| 4301 | width for TABs. | 4325 | width for TABs. |
| 4302 | 4326 | ||
| 4303 | 2001-10-22 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4327 | 2001-10-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4304 | 4328 | ||
| 4305 | * xdisp.c (build_desired_tool_bar_string): Remove unused variable | 4329 | * xdisp.c (build_desired_tool_bar_string): Remove unused variable |
| 4306 | `Qlaplace'. | 4330 | `Qlaplace'. |
| @@ -4352,7 +4376,7 @@ | |||
| 4352 | * mocklisp.c (Finsert_string, Fml_if, Fml_provide_prefix_argument) | 4376 | * mocklisp.c (Finsert_string, Fml_if, Fml_provide_prefix_argument) |
| 4353 | (Fml_prefix_argument_loop): Likewise. | 4377 | (Fml_prefix_argument_loop): Likewise. |
| 4354 | 4378 | ||
| 4355 | 2001-10-21 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4379 | 2001-10-21 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4356 | 4380 | ||
| 4357 | * fileio.c (Finsert_file_contents): Remove unused variable `gap_size'. | 4381 | * fileio.c (Finsert_file_contents): Remove unused variable `gap_size'. |
| 4358 | 4382 | ||
| @@ -4480,7 +4504,7 @@ | |||
| 4480 | * callproc.c (Fcall_process_region, Fcall_process): Likewise. | 4504 | * callproc.c (Fcall_process_region, Fcall_process): Likewise. |
| 4481 | * alloc.c (Fmake_byte_code, Fvector, Flist): Likewise. | 4505 | * alloc.c (Fmake_byte_code, Fvector, Flist): Likewise. |
| 4482 | 4506 | ||
| 4483 | 2001-10-21 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | 4507 | 2001-10-21 Pavel Jan,Am(Bk <Pavel@Janik.cz> |
| 4484 | 4508 | ||
| 4485 | * buffer.c: Reindent DEFUNs and DEFVARs with doc: keywords. | 4509 | * buffer.c: Reindent DEFUNs and DEFVARs with doc: keywords. |
| 4486 | 4510 | ||
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 () | |||
| 1413 | #if defined (MAC_OS) | 1413 | #if defined (MAC_OS) |
| 1414 | FONTSET_ASCII (Vdefault_fontset) | 1414 | FONTSET_ASCII (Vdefault_fontset) |
| 1415 | = Fcons (make_number (0), | 1415 | = Fcons (make_number (0), |
| 1416 | build_string ("-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1")); | 1416 | build_string ("-apple-monaco-medium-r-*--*-120-*-*-*-*-mac-roman")); |
| 1417 | #elif defined (WINDOWSNT) | 1417 | #elif defined (WINDOWSNT) |
| 1418 | FONTSET_ASCII (Vdefault_fontset) | 1418 | FONTSET_ASCII (Vdefault_fontset) |
| 1419 | = Fcons (make_number (0), | 1419 | = Fcons (make_number (0), |
| @@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA. */ | |||
| 40 | #undef free | 40 | #undef free |
| 41 | #undef malloc | 41 | #undef malloc |
| 42 | #undef realloc | 42 | #undef realloc |
| 43 | #undef init_process | ||
| 43 | #include <Carbon/Carbon.h> | 44 | #include <Carbon/Carbon.h> |
| 44 | #undef free | 45 | #undef free |
| 45 | #define free unexec_free | 46 | #define free unexec_free |
| @@ -47,6 +48,8 @@ Boston, MA 02111-1307, USA. */ | |||
| 47 | #define malloc unexec_malloc | 48 | #define malloc unexec_malloc |
| 48 | #undef realloc | 49 | #undef realloc |
| 49 | #define realloc unexec_realloc | 50 | #define realloc unexec_realloc |
| 51 | #undef init_process | ||
| 52 | #define init_process emacs_init_process | ||
| 50 | #else /* not MAC_OSX */ | 53 | #else /* not MAC_OSX */ |
| 51 | #include <Files.h> | 54 | #include <Files.h> |
| 52 | #include <MacTypes.h> | 55 | #include <MacTypes.h> |
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[] = { | |||
| 72 | precompiled header Carbon.h. */ | 72 | precompiled header Carbon.h. */ |
| 73 | #undef max | 73 | #undef max |
| 74 | #undef min | 74 | #undef min |
| 75 | #undef init_process | ||
| 75 | #include <Carbon/Carbon.h> | 76 | #include <Carbon/Carbon.h> |
| 76 | #undef Z | 77 | #undef Z |
| 77 | #define Z (current_buffer->text->z) | 78 | #define Z (current_buffer->text->z) |
| @@ -85,7 +86,9 @@ static unsigned char gray_bits[] = { | |||
| 85 | #define min(a, b) ((a) < (b) ? (a) : (b)) | 86 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 86 | #undef max | 87 | #undef max |
| 87 | #define max(a, b) ((a) > (b) ? (a) : (b)) | 88 | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 88 | #else /* not MAC_OSX */ | 89 | #undef |
| 90 | #define init_process emacs_init_process | ||
| 91 | #else /* not MAC_OSX */ | ||
| 89 | #include <Windows.h> | 92 | #include <Windows.h> |
| 90 | #include <Gestalt.h> | 93 | #include <Gestalt.h> |
| 91 | #include <TextUtils.h> | 94 | #include <TextUtils.h> |
| @@ -4434,7 +4437,7 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 4434 | } | 4437 | } |
| 4435 | #endif /* 0 */ | 4438 | #endif /* 0 */ |
| 4436 | 4439 | ||
| 4437 | error ("Display has an unknown visual class"); | 4440 | return (intern ("true-color")); |
| 4438 | } | 4441 | } |
| 4439 | 4442 | ||
| 4440 | DEFUN ("x-display-save-under", Fx_display_save_under, | 4443 | 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. */ | |||
| 46 | precompiled header Carbon.h. */ | 46 | precompiled header Carbon.h. */ |
| 47 | #undef max | 47 | #undef max |
| 48 | #undef min | 48 | #undef min |
| 49 | #undef init_process | ||
| 49 | #include <Carbon/Carbon.h> | 50 | #include <Carbon/Carbon.h> |
| 50 | #undef Z | 51 | #undef Z |
| 51 | #define Z (current_buffer->text->z) | 52 | #define Z (current_buffer->text->z) |
| @@ -59,6 +60,8 @@ Boston, MA 02111-1307, USA. */ | |||
| 59 | #define min(a, b) ((a) < (b) ? (a) : (b)) | 60 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 60 | #undef max | 61 | #undef max |
| 61 | #define max(a, b) ((a) > (b) ? (a) : (b)) | 62 | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 63 | #undef init_process | ||
| 64 | #define init_process emacs_init_process | ||
| 62 | #else /* not MAC_OSX */ | 65 | #else /* not MAC_OSX */ |
| 63 | #include <MacTypes.h> | 66 | #include <MacTypes.h> |
| 64 | #include <Menus.h> | 67 | #include <Menus.h> |
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. */ | |||
| 44 | precompiled header Carbon.h. */ | 44 | precompiled header Carbon.h. */ |
| 45 | #undef max | 45 | #undef max |
| 46 | #undef min | 46 | #undef min |
| 47 | #undef init_process | ||
| 47 | #include <Carbon/Carbon.h> | 48 | #include <Carbon/Carbon.h> |
| 48 | #undef free | 49 | #undef free |
| 49 | #define free unexec_free | 50 | #define free unexec_free |
| @@ -55,6 +56,8 @@ Boston, MA 02111-1307, USA. */ | |||
| 55 | #define min(a, b) ((a) < (b) ? (a) : (b)) | 56 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 56 | #undef max | 57 | #undef max |
| 57 | #define max(a, b) ((a) > (b) ? (a) : (b)) | 58 | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 59 | #undef init_process | ||
| 60 | #define init_process emacs_init_process | ||
| 58 | #else /* not MAC_OSX */ | 61 | #else /* not MAC_OSX */ |
| 59 | #include <Quickdraw.h> | 62 | #include <Quickdraw.h> |
| 60 | #include <ToolUtils.h> | 63 | #include <ToolUtils.h> |
| @@ -9559,6 +9562,13 @@ x_new_font (f, fontname) | |||
| 9559 | /* Now make the frame display the given font. */ | 9562 | /* Now make the frame display the given font. */ |
| 9560 | if (FRAME_MAC_WINDOW (f) != 0) | 9563 | if (FRAME_MAC_WINDOW (f) != 0) |
| 9561 | { | 9564 | { |
| 9565 | XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->normal_gc, | ||
| 9566 | f->output_data.mac->font); | ||
| 9567 | XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->reverse_gc, | ||
| 9568 | f->output_data.mac->font); | ||
| 9569 | XSetFont (FRAME_MAC_DISPLAY (f), f->output_data.mac->cursor_gc, | ||
| 9570 | f->output_data.mac->font); | ||
| 9571 | |||
| 9562 | frame_update_line_height (f); | 9572 | frame_update_line_height (f); |
| 9563 | if (NILP (tip_frame) || XFRAME (tip_frame) != f) | 9573 | if (NILP (tip_frame) || XFRAME (tip_frame) != f) |
| 9564 | x_set_window_size (f, 0, f->width, f->height); | 9574 | 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) | |||
| 10651 | } | 10661 | } |
| 10652 | 10662 | ||
| 10653 | 10663 | ||
| 10654 | /* Sets up the table font_name_table to contain the list of all | 10664 | static void |
| 10655 | monospace fonts in the system the first time the table is used so | 10665 | add_font_name_table_entry (char *font_name) |
| 10656 | that the Resource Manager need not be accessed every time this | 10666 | { |
| 10657 | information is needed. */ | 10667 | if (font_name_table_size == 0) |
| 10668 | { | ||
| 10669 | font_name_table_size = 16; | ||
| 10670 | font_name_table = (char **) | ||
| 10671 | xmalloc (font_name_table_size * sizeof (char *)); | ||
| 10672 | } | ||
| 10673 | else if (font_name_count + 1 >= font_name_table_size) | ||
| 10674 | { | ||
| 10675 | font_name_table_size += 16; | ||
| 10676 | font_name_table = (char **) | ||
| 10677 | xrealloc (font_name_table, | ||
| 10678 | font_name_table_size * sizeof (char *)); | ||
| 10679 | } | ||
| 10680 | |||
| 10681 | font_name_table[font_name_count++] = font_name; | ||
| 10682 | } | ||
| 10683 | |||
| 10684 | /* Sets up the table font_name_table to contain the list of all fonts | ||
| 10685 | in the system the first time the table is used so that the Resource | ||
| 10686 | Manager need not be accessed every time this information is | ||
| 10687 | needed. */ | ||
| 10658 | 10688 | ||
| 10659 | static void | 10689 | static void |
| 10660 | init_font_name_table () | 10690 | init_font_name_table () |
| @@ -10700,23 +10730,21 @@ init_font_name_table () | |||
| 10700 | 10730 | ||
| 10701 | while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size) | 10731 | while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size) |
| 10702 | == noErr) | 10732 | == noErr) |
| 10703 | { | 10733 | if (size == 0) |
| 10704 | if (font_name_table_size == 0) | 10734 | { |
| 10705 | { | 10735 | add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10706 | font_name_table_size = 16; | 10736 | style, sc)); |
| 10707 | font_name_table = (char **) | 10737 | add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10708 | xmalloc (font_name_table_size * sizeof (char *)); | 10738 | italic, sc)); |
| 10709 | } | 10739 | add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10710 | else if (font_name_count + 1 >= font_name_table_size) | 10740 | bold, sc)); |
| 10711 | { | 10741 | add_font_name_table_entry (mac_to_x_fontname (name, size, |
| 10712 | font_name_table_size += 16; | 10742 | italic | bold, |
| 10713 | font_name_table = (char **) | 10743 | sc)); |
| 10714 | xrealloc (font_name_table, | 10744 | } |
| 10715 | font_name_table_size * sizeof (char *)); | 10745 | else |
| 10716 | } | 10746 | add_font_name_table_entry (mac_to_x_fontname (name, size, style, |
| 10717 | font_name_table[font_name_count++] | 10747 | sc)); |
| 10718 | = mac_to_x_fontname (name, size, style, sc); | ||
| 10719 | } | ||
| 10720 | } | 10748 | } |
| 10721 | 10749 | ||
| 10722 | /* Dispose of the iterators. */ | 10750 | /* 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. */ | |||
| 253 | 253 | ||
| 254 | #define C_SWITCH_SYSTEM_TEMACS -Dtemacs | 254 | #define C_SWITCH_SYSTEM_TEMACS -Dtemacs |
| 255 | 255 | ||
| 256 | /* The ncurses library has been moved out of the System framework in | ||
| 257 | Mac OS X 10.2. So if ./configure detects it, set the command-line | ||
| 258 | option to use it. */ | ||
| 259 | #ifdef HAVE_LIBNCURSES | ||
| 260 | #define LIBS_TERMCAP -lncurses | ||
| 261 | #endif | ||
| 262 | |||
| 256 | /* Link this program just by running cc. */ | 263 | /* Link this program just by running cc. */ |
| 257 | #define ORDINARY_LINK | 264 | #define ORDINARY_LINK |
| 258 | 265 | ||
diff --git a/src/xfaces.c b/src/xfaces.c index 7d41a41a83b..fbac43205eb 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -918,6 +918,9 @@ init_frame_faces (f) | |||
| 918 | #ifdef WINDOWSNT | 918 | #ifdef WINDOWSNT |
| 919 | if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) | 919 | if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) |
| 920 | #endif | 920 | #endif |
| 921 | #ifdef MAC_OS | ||
| 922 | if (!FRAME_MAC_P (f) || FRAME_MAC_WINDOW (f)) | ||
| 923 | #endif | ||
| 921 | if (!realize_basic_faces (f)) | 924 | if (!realize_basic_faces (f)) |
| 922 | abort (); | 925 | abort (); |
| 923 | } | 926 | } |
| @@ -6337,6 +6340,17 @@ try_font_list (f, attrs, family, registry, fonts) | |||
| 6337 | if (STRINGP (face_family)) | 6340 | if (STRINGP (face_family)) |
| 6338 | nfonts = try_alternative_families (f, face_family, registry, fonts); | 6341 | nfonts = try_alternative_families (f, face_family, registry, fonts); |
| 6339 | 6342 | ||
| 6343 | #ifdef MAC_OS | ||
| 6344 | /* When realizing the default face and a font spec does not matched | ||
| 6345 | exactly, Emacs looks for ones with the same registry as the | ||
| 6346 | default font. On the Mac, this is mac-roman, which does not work | ||
| 6347 | if the family is -etl-fixed, e.g. The following widens the | ||
| 6348 | choices and fixes that problem. */ | ||
| 6349 | if (nfonts == 0 && STRINGP (face_family) && STRINGP (registry) | ||
| 6350 | && xstricmp (XSTRING (registry)->data, "mac-roman") == 0) | ||
| 6351 | nfonts = try_alternative_families (f, face_family, Qnil, fonts); | ||
| 6352 | #endif | ||
| 6353 | |||
| 6340 | if (nfonts == 0 && !NILP (family)) | 6354 | if (nfonts == 0 && !NILP (family)) |
| 6341 | nfonts = try_alternative_families (f, family, registry, fonts); | 6355 | nfonts = try_alternative_families (f, family, registry, fonts); |
| 6342 | 6356 | ||
| @@ -6743,18 +6757,6 @@ realize_x_face (cache, attrs, c, base_face) | |||
| 6743 | fontset = default_face->fontset; | 6757 | fontset = default_face->fontset; |
| 6744 | face->fontset = make_fontset_for_ascii_face (f, fontset); | 6758 | face->fontset = make_fontset_for_ascii_face (f, fontset); |
| 6745 | face->font = NULL; /* to force realize_face to load font */ | 6759 | face->font = NULL; /* to force realize_face to load font */ |
| 6746 | |||
| 6747 | #ifdef MAC_OS | ||
| 6748 | /* Load the font if it is specified in ATTRS. This fixes | ||
| 6749 | changing frame font on the Mac. */ | ||
| 6750 | if (STRINGP (attrs[LFACE_FONT_INDEX])) | ||
| 6751 | { | ||
| 6752 | struct font_info *font_info = | ||
| 6753 | FS_LOAD_FONT (f, 0, XSTRING (attrs[LFACE_FONT_INDEX])->data, -1); | ||
| 6754 | if (font_info) | ||
| 6755 | face->font = font_info->font; | ||
| 6756 | } | ||
| 6757 | #endif | ||
| 6758 | } | 6760 | } |
| 6759 | 6761 | ||
| 6760 | /* Load colors, and set remaining attributes. */ | 6762 | /* Load colors, and set remaining attributes. */ |