Mercurial > emacs
comparison mac/src/macmenu.c @ 36417:350e6092a4c4
* src/macfns.c: Rename everything containing *busy_cursor* and
similar to *hourglass*.
Change IMAGE_POSITIVE_INTEGER_VALUE to
IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR throughout.
(x_set_font): If font hasn't changed, avoid recomputing faces and
other things, as in xfns.c.
(Qcancel_timer): New variable.
(syms_of_macfns): Rename x-busy-pointer-shape to
x-hourglass-pointer-shape, display-busy-cursor to
display-hourglass, busy-cursor-delay to hourglass-delay, as in
xfns.c.
(x_set_tool_bar_lines): Modify as in xfns.c
(x_change_window_heights): New function.
* inc/macterm.h (struct x_output): Rename busy_cursor to
hourglass_cursor, busy_window to hourglass_window, busy_p to
hourglass_p, as in xterm.h.
* src/macmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
safe_run_hooks, as in xmenu.c.
* src/macterm.c (do_check_ram_size): New function.
* src/Emacs.r: Add ALRT resource #129 for alert when there is over
256 MB RAM.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Tue, 27 Feb 2001 14:33:20 +0000 |
parents | 923b8d6d8277 |
children | dc9d8a2e8650 |
comparison
equal
deleted
inserted
replaced
36416:e8200ba10907 | 36417:350e6092a4c4 |
---|---|
1343 } | 1343 } |
1344 | 1344 |
1345 set_buffer_internal_1 (XBUFFER (buffer)); | 1345 set_buffer_internal_1 (XBUFFER (buffer)); |
1346 | 1346 |
1347 /* Run the Lucid hook. */ | 1347 /* Run the Lucid hook. */ |
1348 call1 (Vrun_hooks, Qactivate_menubar_hook); | 1348 safe_run_hooks (Qactivate_menubar_hook); |
1349 /* If it has changed current-menubar from previous value, | 1349 /* If it has changed current-menubar from previous value, |
1350 really recompute the menubar from the value. */ | 1350 really recompute the menubar from the value. */ |
1351 if (! NILP (Vlucid_menu_bar_dirty_flag)) | 1351 if (! NILP (Vlucid_menu_bar_dirty_flag)) |
1352 call0 (Qrecompute_lucid_menubar); | 1352 call0 (Qrecompute_lucid_menubar); |
1353 safe_run_hooks (Qmenu_bar_update_hook); | 1353 safe_run_hooks (Qmenu_bar_update_hook); |