* w32menu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.
* xmenu.c (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.
(region_list_head, region_list_tail, lca, nlc, infile_lc_highest_addr)
(text_seg_lowest_offset, mh, curr_header_offset, infd, outfd)
(emacs_zone, data_segment_old_fileoff, data_segment_scp)
(num_unexec_regions, unexec_regions): Make variables static.
(print_regions, find_emacs_zone_regions): Make static.
(unexec_region_info): New typedef.
(unexec_regions): Change type from vm_range_t[] to unexec_region_info[].
All uses changed.
(unexec_regions_recorder): Subtract size of trailing null pages from
filesize. Show filesize.
(unexec_regions_merge): Don't merge if null pages of preceding region
is not too small. Use long format in printf.
(copy_segment, copy_data_segment): Show filesize.
(copy_data_segment): Write filesize bytes of region data. Adjust
filesize in segment command accordingly.
(dump_it): Use long format in printf.
* unexmacosx.c (mach_header, segment_command, vm_region, section)
[_LP64]: New defines.
(VM_REGION_BASIC_INFO_COUNT, VM_REGION_BASIC_INFO, LC_SEGMENT)
(MH_MAGIC) [_LP64]: Redefine.
(delta): Remove variable.
(curr_file_offset, pagesize): New variables.
(ROUNDUP_TO_PAGE_BOUNDARY): New macro.
(data_segment_old_fileoff): Initialize explicitly.
(print_region, unexec_regions_recorder, print_load_command_name)
(copy_segment, copy_data_segment): Use long format in printf.
(MAX_UNEXEC_REGIONS): Increase to 400.
(unexec_regions_recorder): Don't warn too many regions here.
(find_emacs_zone_regions): Warn too many regions here.
(print_load_command_name) [_LP64]: Show correct load command name.
(copy_segment, copy_data_segment): Use variable `curr_file_offset'.
Show starting virtual memory address. Don't show ending file offset.
(copy_symtab, copy_dysymtab, copy_twolevelhints): New argument DELTA.
(dump_it): Use new local variable `linkedit_delta' and pass to them.
Error if trying to handle multiple DATA segments.
(unexec): Initialize variable `pagesize'.
(Qread_expression_history): New variable.
(syms_of_minibuf): Initialize them.
(Feval_minibuffer): Use Vread_expression_map and Qread_expression_history.
(syms_of_callint): Initialize it.
(callint_message_size): Var deleted.
(Fcall_interactively): Use Fformat instead of doprnt to construct
prompt string.
argument OVERSTRIKE_P.
(mac_draw_string_common, mac_draw_image_string_cg): Likewise.
Support overstrike.
(mac_draw_string, mac_draw_string_16): Remove functions.
(x_draw_glyph_string_foreground): Use overstrike when needed.
(x_draw_composite_glyph_string_foreground): Likewise. Use
mac_draw_image_string_16 instead of mac_draw_string_16.
(mac_load_query_font): Rename from XLoadQueryFont. Take argument F
instead of DPY. All uses changed. Don't save/restore font.