* w32fns.c (w32_load_font): If a BDF font is already loaded, do not
	reload it.

	* w32fns.c (Fx_file_dialog): Use ENCODE_FILE instead of
	ENCODE_SYSTEM for filenames.

passing them to OS functions for display.

to directories only on CDN_INITDONE message.
(Fx_file_dialog): Default to directories only when prompt starts
with "Dired".

Fix typo in docstring.
(Fx_create_frame, Fw32_find_bdf_fonts, Fx_show_tip)
(Fw32_unregister_hot_key, Fw32_reconstruct_hot_key):
Make argument names match their use in docstring.

(Fw32_toggle_lock_key) [USE_LISP_UNION_TYPE]: Cast from Lisp_Object
using i member.
(w32_quit_key): Rename from Vw32_quit_key, and make an int.
(syms_of_w32fns, globals_of_w32fns): Use Lisp_Object and int consistently.
(w32_color_map_lookup): Return a Lisp_Object.
(x_to_w32_charset, w32_to_x_charset, w32_to_all_x_charsets):
Use EQ to compare Lisp_Objects.
(w32_parse_hot_key): Use int for lisp_modifiers consistently.
(w32_wnd_proc): Use w32_num_mouse_buttons.

inhibit-modification-hooks to t temporarily before calling
Ferase_buffer.

(globals_of_w32fns): Set it.

(Vx_bitmap_file_path, Vimage_cache_eviction_delay)
(x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
(x_reference_bitmap, x_create_bitmap_from_data)
(x_create_bitmap_from_file, x_destroy_bitmap)
(x_destroy_all_bitmaps, x_create_bitmap_mask)
(QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
(QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
(Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
(define_image_type, lookup_image_type, valid_image_p)
(image_error, enum image_value_type, struct image_keyword)
(parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
(make_image, free_image, prepare_image_for_display, image_ascent)
(four_corners_best, image_background, image_background_transparent)
(x_clear_image_1,  x_clear_image, x_alloc_image_color)
(make_image_cache, free_image_cache, clear_image_cache)
(Fclear_image_cache, postprocess_image, lookup_image, cache_image)
(forall_images_in_image_cache, x_create_x_image_and_pixmap)
(x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
(struct ct_color, init_color_table, free_color_table)
(lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
(cross_disabled_images, x_to_xcolors, x_from_xcolors)
(x_detect_edges, x_emboss, x_laplace, x_edge_detection)
(x_disable_image, x_build_heuristic_mask)
(XBM support, XPM support, PBM support, PNG support, JPEG support)
(TIFF support, GIF support, Ghostscript support): Merge with image
code from xfns.c and macfns.c into image.c.
(syms_of_xfns): Move image related symbols to image.c.
(init_external_image_libraries, init_xfns): Remove; initialization
moved to init_image in image.c.

(xbm_read_bitmap_data): Use unsigned char for image data.

Make doc string and parameters same as for X version.

* w32fns.c (x_to_w32_font): Likewise.

(valid_image_p, parse_image_spec): Use IMAGEP macro.

filling them.
* w32bdf.c (w32_load_bdf_font): Likewise.

(globals_of_w32fns): Initialize it.

(Fx_open_connection): Use it.

new macros in dispextern.h, frame.h and window.h.

parameters now defined in frame.h and frame.c.
(Vx_resource_name): Remove. Use generic var.
(enum x_frame_parms): Remove (bogus, unused enum).
(check_x_display_info): Make non-static (for frame.c).
(struct x_frame_parm_table, x_frame_parms): Remove.
(init_x_parm_symbols, x_set_frame_parameters, x_report_frame_params)
(x_set_line_spacing, x_set_screen_gamma, x_icon_type, x_set_font)
(x_set_border_width, x_set_internal_border_width, x_set_visibility)
(x_change_window_heights, x_set_autoraise, x_set_autolower)
(x_set_vertical_scroll_bars, x_set_scroll_bar_width)
(validate_x_resource_name, Fx_get_resource, x_get_resource_string)
(x_default_parameter, Fx_parse_geometry, x_figure_window_size):
Remove.  Use generic functions instead.
(enum resource_types): Remove.
(x_set_scroll_bar_default_width): New global function (for frame.c).
(Fx_create_frame): Depend on x_figure_window_size to add space for
toolbar and setup size_hint_flags.
(w32_frame_parm_handlers): New table for redisplay_interface.
(syms_of_w32fns): Don't intern/staticpro removed vars.

as binary.

passed on the command line.

max_fonts parameter means list all.

local malloc.
[HAVE_XPM]: Avoid clashes with XColor, XImage and Pixel
definitions in xpm.h.
(init_xpm_functions): New function.
(xpm_load): Sync with xfns.c. Adapt for Windows version of libXpm.
(init_external_image_libraries): Try to load libXpm.dll.

(tiff_load): Adjust colors for Windows. Disable color table lookups. Call
library functions through pointers determined at runtime.
(init_external_image_libraries): Try to load libtiff.dll.

(init_gif_functions): New function.
(gif_load): Sync with xfns.c version. Adjust colors for Windows. Disable color
table lookups. Call gif library functions through pointers determined at
runtime.
(init_external_image_libraries): Try to load libungif.dll.

an alternative name for jpeg.dll.

New functions.
(jpeg_load): Sync with xfns.c version. Adjust colors for Windows.
Disable color table lookups. Call jpeg library functions
through pointers determined at runtime.
(init_external_image_libraries): Try to load jpeg.dll.