diff src/ChangeLog @ 88155:d7ddb3e565de

sync with trunk

--- a/src/ChangeLog	Sun Jan 15 23:02:10 2006 +0000
+++ b/src/ChangeLog	Mon Jan 16 00:03:54 2006 +0000
@@ -1,3 +1,14552 @@
[phone]  Andreas Schwab  <[e-mail]>
+
+	* search.c (Freplace_match): Use UPPERCASEP instead of !NOCASEP.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* Makefile.in: Define new macro WINDOW_SUPPORT.
+	(lisp): Use it.
+	(SOME_MACHINE_LISP): Add conditionally loaded files.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c [USE_ATSUI] (atsu_get_text_layout_with_text_ptr)
+	[MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Specify kATSLineUseQDRendering.
+	(XLoadQueryFont) [USE_ATSUI]: Display diacritical marks in
+	decomposed form.
+
+	* process.c [HAVE_INTTYPES_H]: Include inttypes.h.
+	(ifflag_table): Fix typo (IFF_OACTIV -> IFF_OACTIVE).
+	(Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ_IFR_NETMASK
+	macro.  Also try member ifr_addr when getting netmask.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name): Remove redundant tests.
+	Fix elimination of // so that it doesn't prevent elimination of an
+	immediately following /. or /..
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_toggle_notify_cb): New function.
+	(xg_toggle_visibility_cb): Move setting of x_gtk_show_hidden_files to
+	xg_toggle_notify_cb.
+	(xg_get_file_with_chooser): Add callback to xg_toggle_notify_cb when
+	parameter value changes so the toggle button gets updated.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* .gdbinit: Fix typo.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* .gdbinit: Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fmake_network_process): Use AF_INET instead of
+	AF_UNSPEC when AF_INET6 is not defined.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (mac_coerce_file_name_ptr, mac_coerce_file_name_desc):
+	Don't check that the other type is known file-related one.
+
+	* macfns.c (Fx_server_version): Use gestaltSystemVersionMajor,
+	gestaltSystemVersionMinor, and gestaltSystemVersionBugFix on Mac
+	OS X 10.4 and later.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
+	let GTK do all image processing.  Importing Emacs own pixmaps to GTK
+	looks bad for inactive tool bar items with some Gnome themes.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* .gdbinit: Avoid a warning message when x_error_quitter is not
+	compiled in.
+
+	* process.c [WINDOWSNT]: Undef AF_INET6 to disable IPv6 support
+	for w32.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c: Add IPv6 support.
+	(Qipv4, Qipv6): New vars.
+	(syms_of_process): Intern and staticpro them.
+	(Fformat_network_address): Handle 9 or 8 element vector as IPv6 address
+	with or without port number.  Handle 4 element vector as IPv4 address
+	without port number.
+	(conv_sockaddr_to_lisp, get_lisp_to_sockaddr_size)
+	(conv_lisp_to_sockaddr): Handle IPv6 addresses.
+	(Fmake_network_process): Use :family 'ipv4 and 'ipv6 to explicitly
+	request that address family only.  :family nil or omitted means to
+	determine address family from the specified :host and :service.
+	(ifflag_table): Add missing OpenBSD IFF_ flags.
+	(server_accept_connection): Handle IPv6 addresses.
+	(init_process): Add (:family ipv4) and (:family ipv6) sub-features.
+
+	* .gdbinit: Undo last change.  Instead, look at Vsystem_type to
+	determine which breakpoints to set.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (describe_map_compare): Yet another int/Lisp_Object mixup.
+
+	* window.h (Fwindow_minibuffer_p): Declare (for use in minibuf.c).
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* emacs.c (main): Update copyright year.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* callproc.c (delete_temp_file): Bind file-name-handler-alist to
+	nil for the call to internal_delete_file.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* callproc.c (Fcall_process_region): Bind file-name-handler-alist
+	to nil for the call to Fwrite_region.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (read_minibuf): Clear out all other minibuffer windows.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* emacs.c (gdb_pvec_type): A dummy variable for GDB's sake.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* textprop.c (set_text_properties): Reword description of return value.
+	Return Qnil if caller wants to remove all text properties from a
+	string and the string already has no intervals.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* term.c (visible_cursor): New boolean var.
+	(set_terminal_modes, tty_show_cursor): Use "vs" or "ve" depending on
+	visible_cursor.
+	(syms_of_term): Export the new var as "visible-cursor".
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* .gdbinit: Tell users not to worry about GDB warnings that some
+	functions do not exist in the binary.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* process.c (Fnetwork_interface_info): Correctly terminate the
+	loop over ifflag_table.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (readevalloop): Test for reading a whole buffer
+	before actually reading anything.  Handle all cases, including
+	START = END = nil and an already-narrowed buffer.
+	Convert END to a marker if it is a number.
+
+	* keymap.c (describe_map): Put sparse map elements into an array,
+	sort them, then output a sequence of identical bindings on one line.
+	(struct describe_map_elt): New data type.
+	(describe_map_compare): New function.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_file_with_chooser): Change message shown
+	in file chooser.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (readevalloop): Set PT and ZV in the proper buffer,
+	not the current one.
+
+	* minibuf.c (Fminibuffer_message): Doc fix.
+	(read_minibuf): Set current_buffer->enable_multibyte_characters sooner.
+
+	* eval.c (do_autoload): Ignore elements of Vautoload_queue
+	where car is not symbol.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* charset.c (lisp_string_width): Check multibyteness of STRING.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c: x_show_hidden_files, new variable.
+	(syms_of_xfns): Defvar it.
+
+	* gtkutil.c (xg_toggle_visibility_cb): New function.
+	(xg_get_file_with_chooser): Add toggle hidden files and a message
+	to the new file chooser dialog.  Show hidden files if
+	x_show_hidden_files is non-zero.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.h: Undo previous change.
+
+	* Makefile.in (undo.o): Undo previous change.
+
+	* undo.c: Undo previous change.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keyboard.h: extern last_point_position_window.
+
+	* undo.c: include keyboard.h.
+
+	* Makefile.in (undo.o): Depend on keyboard.h.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* commands.h (last_point_position_window): Declare.
+
+	* undo.c: Depend on window.h.
+	(record_point): Save old point from the correct window.
+
+	* keyboard.c (last_point_position_window): New variable.
+	(command_loop_1): Set last_point_position_window.
+	(syms_of_keyboard): Init it.
+
+	* Makefile.in (undo.o): Depend on window.h.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (un_autoload): Expect (0 . OFEATURES) in Vautoload_queue
+	to undo a `provide'.
+
+	* fns.c (Fprovide): Store (0 . OFEATURES) in Vautoload_queue.
+
[phone]  Giorgos Keramidas  <[e-mail]>
+
+	* m/amdx86-64.h [__FreeBSD__] (START_FILES, LIB_STANDARD):
+	define for FreeBSD on this platform.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.h (TYPE_FILE_NAME): New define.
+	(posix_pathname_to_fsspec, fsspec_to_posix_pathname): Remove externs.
+
+	* mac.c (posix_pathname_to_fsspec, fsspec_to_posix_pathname):
+	Add prototypes.  Make static.
+	(mac_aedesc_to_lisp): Initialize err to noErr.
+	(mac_coerce_file_name_ptr, mac_coerce_file_name_desc)
+	(init_coercion_handler): New functions.
+	(Fmac_coerce_ae_data): Use coercion of Apple event data for
+	translation from/to file names.
+
+	* macterm.c: Don't include sys/param.h.
+	(init_coercion_handler): Add extern.
+	[MAC_OS8] (main): Call init_coercion_handler.
+	(mac_initialize) [MAC_OSX]: Likewise.
+	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Use coercion of
+	Apple event data for translation from/to file names.
+
+	* macfns.c [TARGET_API_MAC_CARBON] (Fx_file_dialog): Likewise.
+
+	* image.c [MAC_OS] (find_image_fsspec): Likewise.
+
[phone]  Martin Rudalics  <[e-mail]>  (tiny change)
+
+	* insdel.c (insert, insert_and_inherit, insert_before_markers)
+	(insert_before_markers_and_inherit): Make sure FROM is correct
+	when `after-change-functions' are called.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (Fx_uses_old_gtk_dialog): New function.
+
+	* gtkutil.c (xg_uses_old_file_dialog): New function.
+	(xg_get_file_name): Use xg_uses_old_file_dialog.
+
+	* gtkutil.h: Declare xg_uses_old_file_dialog.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (xmenu_show): Call inhibit_garbage_collection.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (Fmac_coerce_ae_data) [MAC_OSX]: Fix memory leak.
+
+	* macgui.h (XCharStruct): Remove member `valid_p'.
+	(STORE_XCHARSTRUCT): Don't set member `valid_p'.
+	(XCharStructRow): New typedef.
+	(XCHARSTRUCTROW_CHAR_VALID_P, XCHARSTRUCTROW_SET_CHAR_VALID):
+	New macros.
+	(struct MacFontStruct): Add member `bounds'.  Remove member
+	`per_char'.  All uses for QuichDraw Text fonts are changed to
+	`bounds.per_char'.  ATSUI font bounds are represented as an array
+	`bounds.rows' of XCharStructRow's, each of which consists of a
+	bitmap of valid entries and an array of char bounds.
+
+	* macterm.c (mac_per_char_metric): Add prototype.
+	(x_per_char_metric) [USE_CG_TEXT_DRAWING]: Remove prototype.
+	(mac_query_char_extents): New function.
+	(x_per_char_metric): Use it.
+	(XLoadQueryFont): Likewise.  Consolidate min/max_bounds calculations.
+	[USE_CG_TEXT_DRAWING] (mac_draw_string_cg):
+	Use mac_per_char_metric instead of x_per_char_metric.
+	(mac_text_extents_16): New function.
+	(mac_compute_glyph_string_overhangs): Use it.
+	(mac_unload_font): Free member `bounds' in struct MacFontStruct.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (Fdisplay_completion_list): Use XCAR/XCDR.
+	(Fminibuffer_completion_help): Remove duplicates before display.
+
[phone]  L$,1 q(Brentey K,Aa(Broly  <[e-mail]>
+
+	* print.c (print_preprocess): Don't lose print_depth levels while
+	iterating.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macmenu.c (Qmac_apple_event): Add extern.
+	(set_frame_menubar, mac_menu_show keymp_panes)
+	(single_keymap_panes, list_of_panes, list_of_item)
+	(single_menu_item): Add argument types to prototypes.
+	(mac_dialog_show) [HAVE_DIALOGS]: Likewise.
+	(struct skp): New struct (from xmenu.c).
+	(single_keymap_panes, single_menu_item, list_of_panes)
+	(list_of_item): Sync with xmenu.c.
+	(Fx_popup_menu, Fx_popup_dialog): Likewise.  Don't get window from
+	POSITION if it is mac-apple-event event.
+	(menubar_selection_callback): Don't use menu_command_in_progress.
+	(set_frame_menubar): First parse all submenus, then make
+	widget_value trees from them.  Don't allocate any widget_value
+	objects until we are done with the parsing.
+	(parse_single_submenu, digest_single_submenu): New functions.
+	(single_submenu): Function deleted, replaced by those two.
+	(install_menu_quit_handler) [HAVE_CANCELMENUTRACKING]: Don't
+	create or dispose of EventHandlerUPP.  Install hander to all submenus.
+	(mac_menu_show) [!HAVE_MULTILINGUAL_MENU]: Use ENCODE_MENU_STRING
+	instead of ENCODE_SYSTEM.
+	(free_frame_menubar, fill_submenu, fill_menu): Don't use NULL for
+	integer values.
+	[HAVE_DIALOGS] (mac_dialog_show): Sync with xdialog_show (in xmenu.c).
+	(add_menu_item) [TARGET_API_MAC_CARBON]: Use CFString functions to
+	format menu item string.  Don't use NULL for integer value.
+
+	* macterm.h (struct mac_output): Remove unused member
+	menu_command_in_progress.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* xmenu.c (Fx_popup_menu): Set Vmenu_updating_frame to f if
+	position is non-nil, else set it to nil.
+
+	* macmenu.c (Fx_popup_menu): Add `else' to set
+	Vmenu_updating_frame to nil only if position is nil.
+
+	* w32menu.c (Fx_popup_menu): Add `else' to set
+	Vmenu_updating_frame to nil only if position is nil.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c (make_lispy_event): Drag-and-drop items are now
+	stored in member `args' of struct input_event.
+
+	* termhooks.h (struct input_event): Fix comment for DRAG_N_DROP_EVENT.
+
+	* xselect.c (x_handle_dnd_message): Drag-and-drop items are now
+	stored in member `args' of struct input_event.
+
+	* w32term.c (construct_drag_n_drop): Likewise.
+
+	* macterm.c (mac_do_receive_drag): Likewise.
+	(x_use_underline_position_properties): Undo 2005-07-13 change.
+	(syms_of_macterm) <x-use-underline-position-properties>: Likewise.
+	(mac_use_core_graphics, mac_wheel_button_is_mouse_2)
+	(mac_pass_command_to_system, mac_pass_control_to_system):
+	New boolean variables renamed from Lisp_Object ones
+	Vmac_use_core_graphics, Vmac_wheel_button_is_mouse_2,
+	Vmac_pass_command_to_system, and Vmac_pass_control_to_system.
+	All uses changed.
+	(syms_of_macterm): DEFVAR_BOOL them.  Remove previous DEFVAR_LISPs.
+	Make them user options.
+	(mac_handle_command_event, mac_store_services_event):
+	Call create_apple_event_from_event_ref without 5th argument.
+	(backtranslate_modified_keycode): Mask off modifier keys that are
+	mapped to some Emacs modifiers before passing it to KeyTranslate.
+	(syms_of_macterm): Make variables `mac-emulate-three-button-mouse',
+	`mac-wheel-button-is-mouse-2', and `mac-*-modifier' user options.
+	Fix docstrings of `mac-*-modifier'.
+
+	* mac.c (create_apple_event_from_event_ref): Remove arg `types'.
+	(do_applescript): Change argument types to Lisp_Object.
+	All uses changed.
+
+	* macterm.h (create_apple_event_from_event_ref): Remove 5th
+	argument from extern.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* xfns.c (Fx_backspace_delete_keys_p): In case we cannot determine
+	the answer, return `lambda', not nil.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in (bootstrap-temacs): Warn that parts of commands
+	enclosed in $(ARGQUOTE)s should not be split between two lines, as
+	that will break with GNU Make >3.80, when sh.exe is used and
+	arg quoting is with '..'.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* print.c (print_preprocess): Just signal an error if print_depth
+	is exceeded.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* .gdbinit: Set a breakpoint on w32_abort.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* minibuf.c (Fminibuffer_completion_contents): New Lisp function
+	created from minibuffer_completion_contents.
+	(minibuffer_completion_contents): Remove.
+	(do_completion, Fminibuffer_complete_word)
+	(Fminibuffer_completion_help): Replace minibuffer_completion_contents
+	with Fminibuffer_completion_contents.
+	(syms_of_minibuf): Add Sminibuffer_completion_contents.
+	(Fdisplay_completion_list): Doc fix.
+	(display_completion_list_1): Use `nil' for second arg of
+	`Fdisplay_completion_list'.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (compute_tip_xy): Handle negative dx and dy.
+
+	* w32fns.c (compute_tip_xy): Ditto.
+
+	* macfns.c (compute_tip_xy): Ditto.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* print.c (print_preprocess): Go to a deeper print_depth to avoid
+	print_object loop.
+
[phone]  Kyotaro HORIGUCHI  <[e-mail]>  (tiny change)
+
+	* coding.c (code_convert_region_unwind): GCPRO arg.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,
+	i.e. dy is offset from top of frame instead of bottom.
+
+	* macfns.c (compute_tip_xy): Ditto.
+
+	* w32fns.c (compute_tip_xy): Ditto.
+
+	* gtkutil.c (SSDATA): New macro to remove compiler warnings.
+	(xg_get_image_for_pixmap, xg_create_frame_widgets)
+	(xg_get_file_with_chooser): Use SSDATA instead of SDATA.
+
+	* xmenu.c (menubar_selection_callback): Do nothing if the callback
+	is for an unselected radio menu item.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp) <blink-cursor-alist>: Doc fix.
+
+	* lisp.h [! NO_UNION_TYPE] (EQ): Use == so args are computed just once.
+
+	* keymap.c (Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE.
+	(Flookup_key): Doc fix.
+	(syms_of_keymap) <function-key-map>: Doc fix.
+
+	* fns.c (Frequire): Treat evaluating from a source file
+	like loading the file.
+
+	* floatfns.c (Flog): Doc fix.
+
+	* fileio.c (Finsert_file_contents): Set Vdeactivate_mark
+	when we change the buffer.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* minibuf.c (display_completion_list_1):
+	Call `minibuffer_completion_contents' instead of using `nil' as
+	second arg of `Fdisplay_completion_list'.
+	(keys_of_minibuf): Unbind SPC in
+	Vminibuffer_local_filename_completion_map (see also related
+	change on 2005-12-06).
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* emacs.c (main) [MAC_OS8]: Undo previous change.
+
+	* macselect.c (syms_of_macselect) <mac-apple-event-map>:
+	Initialize to nil.  Keymap is now created in lisp/term/mac-win.el.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* Makefile.in (macselect.o): Depend on keymap.h.
+
+	* emacs.c (main) [MAC_OS8]: Call syms_of_keymap before
+	syms_of_macselect.
+
+	* image.c (init_image) [MAC_OS]: Don't call EnterMovies.
+	[!HAVE_GIF && MAC_OS] (gif_load): Call EnterMovies.
+
+	* keyboard.c (Qmac_apple_event) [MAC_OS]: New variable.
+	(syms_of_keyboard) [MAC_OS]: Initialize it.
+	(make_lispy_event) [MAC_OS]: Build lisp event for MAC_APPLE_EVENT.
+
+	* mac.c (Qundecoded_file_name): New variable.
+	(syms_of_mac): Initialize it.
+	(mac_aelist_to_lisp, mac_aedesc_to_lisp): New functions.
+	[TARGET_API_MAC_CARBON] (create_apple_event_from_event_ref): New fun.
+	(Fmac_coerce_ae_data): New defun.
+	(syms_of_mac): Defsubr it.
+
+	* macselect.c: Include keymap.h.
+	(mac_ready_for_apple_events): New variable.
+	(Vmac_apple_event_map, Qmac_apple_event_class)
+	(Qmac_apple_event_id): New variables.
+	(syms_of_macselect): Initialize them.
+	(Qundefined, mac_store_apple_event): Add externs.
+	(struct apple_event_binding): New struct.
+	(find_event_binding_fun, find_event_binding)
+	(mac_find_apple_event_spec, defer_apple_events)
+	(mac_handle_apple_event, init_apple_event_handler)
+	(copy_scrap_flavor_data): New functions.
+	(Fmac_process_deferred_apple_events): New defun.
+	(syms_of_macselect): Defsubr it.
+	(mac_store_services_event): Fix extern.
+	(mac_handle_service_event): Don't allocate Lisp objects during
+	asynchronous input processing.  Use mac_store_services_event
+	instead of mac_store_application_menu_event.
+
+	* macterm.c (Qmac_ready_for_drag_n_drop, Qapplication, Qabout)
+	(Qpreferences): Remove variables.
+	(syms_of_macterm) : Don't initialize them.
+	(Qhicommand) [USE_CARBON_EVENTS]: New variable.
+	(syms_of_macterm) [USE_CARBON_EVENTS]: Initialize it.
+	(init_required_apple_events, do_ae_open_application)
+	(do_ae_print_documents, do_ae_open_documents)
+	(do_ae_quit_application): Remove functions and prototypes.
+	(mac_ready_for_apple_events, Qundefined, init_apple_event_handler)
+	(mac_find_apple_event_spec): Add externs.
+	(mac_store_application_menu_event): Remove function.
+	(mac_store_apple_event, mac_make_lispy_event_code): New functions.
+	(mac_handle_command_event): Create Apple event from Carbon event.
+	Use mac_store_apple_event instead of mac_store_application_menu_event.
+	[MAC_OSX] (mac_store_services_event): Likewise.
+	(struct SelectionRange, SelectionRange): Remove struct and typedef.
+	[MAC_OS8] (main): Call init_apple_event_handler instead of
+	init_required_apple_events.
+	(mac_initialize) [MAC_OSX]: Likewise.
+	[!USE_CARBON_EVENTS] (mac_wait_next_event):
+	Use mac_ready_for_apple_events instead of Qmac_ready_for_drag_n_drop.
+
+	* macterm.h (mac_make_lispy_event_code, mac_aedesc_to_lisp):
+	Add externs.
+	(create_apple_event_from_event_ref) [TARGET_API_MAC_CARBON]: Likewise.
+	(Fmac_get_preference): Add EXFUN.
+
+	* termhooks.h (enum event_kind) [MAC_OS]: Add new MAC_APPLE_EVENT
+	event.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Reinstate previous change.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32fns.c (w32_abort) [__GNUC__]: Add instructions for attaching
+	GDB to the abort dialog.
+
[phone]  Kyotaro HORIGUCHI <[e-mail]>  (tiny change)
+
+	* indent.c (Fvertical_motion): Force move if starting on
+	stretch glyph.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (read_escape) <\s>: Don't treat strings specially.
+
+	* xfns.c (Fx_create_frame): Comment out previous change.
+
[phone]  L$,1 q(Brentey K,Aa(Broly  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Initialize Vdefault_minibuffer_frame,
+	when needed.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (keys_of_minibuf): Just unbind SPC in
+	Vminibuffer_local_filename_completion_map rather than forcing it
+	explicitly to the same binding as the global map.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* buffer.c (Fkill_buffer): Avoid dangerous side effects in NILP args.
+	* bytecode.c (Fbyte_code): Likewise.
+	* fileio.c (internal_delete_file, Fread_file_name_internal): Likewise.
+	* minibuf.c (Fminibuffer_complete_and_exit): Likewise.
+	* undo.c (truncate_undo_list): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (enlarge_window): Eliminate arg preserve_before.
+	Assume it is 0.  All callers changed.
+	(Fenlarge_window, Fshrink_window): Likewise.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32fns.c (compute_tip_xy): Put tip above pointer if it doesn't
+	fit below.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h: Add prototype for xg_set_icon_from_xpm_data.
+
+	* xfns.c (x_real_positions): int ign => unsigned int.
+	(xg_set_icon_from_xpm_data): Remove unused variable err.
+	(x_set_name_internal, Fx_create_frame, xg_set_icon): Add cast
+	to remove compiler warning.
+	(compute_tip_xy): Put tip above pointer if it doesn't fit below.
+
[phone]  David Reitter  <[e-mail]>
+
+	* minibuf.c (Fcompleting_read): If Vminibuffer_completing_file_name is
+	non-nil, use the new keymaps Vminibuffer_local_filename_completion_map
+	and Vminibuffer_local_must_match_filename_map keymaps.
+	(keys_of_minibuf): Bind SPC in the new file-name completion keymaps.
+
+	* keymap.c (Vminibuffer_local_filename_completion_map)
+	(Vminibuffer_local_must_match_filename_map): New variables.
+	(syms_of_keymap): DEFVAR_LISP them, initialize them, and set their
+	parent to be Vminibuffer_local_completion_map and
+	Vminibuffer_local_must_match_map, respectively.
+
+	* commands.h (Vminibuffer_local_filename_completion_map)
+	(Vminibuffer_local_must_match_filename_map): Declare the new keymaps.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Fset_window_configuration): Don't accidentally copy the
+	window-point of one window to another.
+
[phone]  L$,1 q(Brentey K,Aa(Broly  <[e-mail]>
+
+	* buffer.c (Fpop_to_buffer): Remove superfluous call to record_buffer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c: Include fcntl.h.  Define O_WRONLY if not defined.
+	(valid_lisp_object_p) [!GC_MARK_STACK]: Validate pointer by
+	passing it to `emacs_write'.
+
[phone]  Ari Roponen  <[e-mail]>  (tiny change)
+
+	* atimer.c (stop_other_atimers): Fix loop to correctly compute `prev'.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (adjust_window_trailing_edge): New function.
+	(Fadjust_window_trailing_edge): New function.
+	(syms_of_window): Defsubr it.
+	(window_deletion_count): New variable.
+	(delete_window): Update window_deletion_count.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* minibuf.c (syms_of_minibuf): Mention the extension of
+	`completion-auto-help's meaning by complete.el.
+
[phone]  Henrik Enberg  <[e-mail]>
+
+	* xfaces.c (Finternal_set_lisp_face_attribute_from_resource):
+	Handle :inherit property as a lisp expression.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (Qcontrol): Rename from Qctrl.  All uses changed.
+	(syms_of_macterm): Staticpro Qcontrol, Qmeta, Qalt, Qhyper,
+	Qsuper, and Qmodifier_value.
+	(Vmac_control_modifier, Vmac_option_modifier)
+	(Vmac_command_modifier, Vmac_function_modifier)
+	(Vmac_emulate_three_button_mouse, Vmac_wheel_button_is_mouse_2)
+	(Vmac_pass_command_to_system, Vmac_pass_control_to_system)
+	(Vmac_charset_info_alist): Doc fixes.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* emacs.c (main) [MAC_OSX]: Change working directory to home
+	directory if `-psn_*' option is specified.
+
+	* mac.c (DECODE_UTF_8): Remove macro.
+	[TARGET_API_MAC_CARBON] (cfstring_to_lisp_nodecode): New function
+	created from cfstring_to_lisp.
+	[TARGET_API_MAC_CARBON] (cfstring_to_lisp): Use it.
+	(xrm_get_preference_database) [TARGET_API_MAC_CARBON]: Likewise.
+
+	* macterm.h (cfstring_to_lisp_nodecode) [TARGET_API_MAC_CARBON]:
+	Add prototype.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* keymap.c (shadow_lookup): Use make_number to pass a number to
+	Fsubstring.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increment to 1180000.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* xfaces.c (Finternal_set_lisp_face_attribute):
+	Use :ignore-defface for new frame defaults when `unspecified' is
+	supplied.
+	(Finternal_get_lisp_face_attribute): Hide :ignore-defface.
+	(merge_face_vectors): Don't do :ignore-defface overwriting here.
+	(Finternal_merge_in_global_face): Do it here.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* charset.c (invalid_character): Use Lisp-readable syntax
+	for octal and hex.  Reorder decimal, octal and hex values.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* lisp.h: Use typedef when Lisp_Object is EMACS_INT so that
+	this type is recognised when debugging.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* .gdbinit (nextcons, xcdr, xfloat): Update for changes in
+	Lisp_Cons and Lisp_Float.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c [USE_CG_TEXT_DRAWING] (cg_text_anti_aliasing_threshold):
+	New variable.
+	[USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): New fun.
+	(init_font_name_table) [USE_ATSUI && USE_CG_TEXT_DRAWING]: Use it.
+	[USE_CG_TEXT_DRAWING] (mac_draw_string_cg): Don't do antialiasing if
+	font size is smaller than or equal to cg_text_anti_aliasing_threshold.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* image.c (x_create_bitmap_from_xpm_data): Free attributes on fail.
+
+	* xfaces.c (Qignore_defface): New variable.
+	(syms_of_xfaces): Provide `:ignore-defface'.
+	(IGNORE_DEFFACE_P): New macro.
+	(check_lface_attrs, lface_fully_specified_p)
+	(Finternal_set_lisp_face_attribute)
+	(Fface_attribute_relative_p, Fmerge_face_attribute):
+	Handle Qignore_defface as a possible value.
+	(merge_face_vectors): The merged face is `unspecified' if the
+	mergee specifies `:ignore-defface'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (readevalloop): Add missing GCPROs.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* xfns.c (xg_set_icon_from_xpm_data): New function.
+
+	* gnu.h (gnu_xpm_bits): Rename from gnu_bits.
+	(gnu_xbm_bits): Rename from gnu_bits (xbm version).
+
+	* xterm.c (x_bitmap_icon): Use the xpm if available.
+
+	* image.c (x_create_bitmap_from_xpm_data): New function.
+	(x_create_bitmap_from_xpm_data): Initialize XpmAttributes.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): Add rfn-eshadow.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* .gdbinit: Make SIGTSTP work like SIGINT normally does.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h (struct Lisp_Cons): Make cdr a union.
+	(XCDR_AS_LVALUE): Adjust.
+	(struct Lisp_Float): Make data a union.
+	(XFLOAT_DATA): Adjust.
+
+	* alloc.c (free_float): Make free list chaining aliasing-safe.
+	(make_float): Likewise.
+	(free_cons): Likewise.
+	(Fcons): Likewise.
+	(check_cons_list): Likewise.
+	(Fmake_symbol): Likewise.
+	(allocate_misc): Likewise.
+	(free_misc): Likewise.
+	(gc_sweep): Likewise.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (HASHKEY_QUERY_CACHE): New define.
+	(xrm_create_database, xrm_q_put_resource): Empty query cache.
+	(xrm_get_resource): Use query cache.
+
+	* image.c (init_image) [MAC_OS]: Don't call EnterMovies if
+	inhibit_window_system is set.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macgui.h (USE_CG_TEXT_DRAWING): New define.
+	(struct MacFontStruct) [USE_CG_TEXT_DRAWING]: New members cg_font
+	and cg_glyphs.
+
+	* macterm.c [USE_CG_TEXT_DRAWING] (mac_draw_string_cg): New function.
+	(x_draw_glyph_string_foreground) [USE_CG_TEXT_DRAWING]: Use it.
+	(XLoadQueryFont) [USE_CG_TEXT_DRAWING]: Set members cg_font and
+	cg_glyphs in struct MacFontStruct if synthesized bold or italic is
+	not used and font substitution never occurs for ASCII and Latin-1
+	characters.
+	(XLoadQueryFont): Maximum and minimum metrics are now those among
+	ASCII characters.
+	(XLoadQueryFont) [!MAC_OS8 || USE_ATSUI]: Apply WebKit-style
+	height adjustments for Courier, Helvetica, and Times.
+
+	* s/darwin.h (LIBS_CARBON) [!HAVE_CARBON]: Remove `-framework Carbon'.
+
[phone]  David Reitter <[e-mail]>
+
+	* macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
+	macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
+	Vmac_control_modifier / mac-control-modifier,
+	Vmac_option_modifier / mac-option-modifier,
+	Vmac_command_modifier / mac-command-modifier.
+	(mac_to_emacs_modifiers): Use the new style modifier
+	variables.  Return UInt32 (modifiers are longs now.)
+	(backtranslate_modified_keycode): New function (refactoring).
+	(XTread_socket): Use new modifier variables and refactored function.
+	(mac_determine_quit_char_modifiers): Remove macMetaKey (there is
+	no dedicated meta key.  Not in use anyway.)
+	(convert_fn_keycode): Map Fn-keys to their original keycode
+	using a table (english keyboard only).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* .gdbinit (pitx): Fix output format if n_overlay_strings > 0.
+	Add post hook to "backtrace" to always dump lisp call stack to
+	increase chance of people sending it to us when reporting bugs.
+
+	* doc.c (Fsubstitute_command_keys): Doc fix.
+
+	* dispextern.h (struct it): New member ignore_overlay_strings_at_pos_p.
+
+	* xdisp.c (handle_stop): Skip overlay string handling if
+	ignore_overlay_strings_at_pos_p is set.
+	(set_iterator_to_next): At end of display vector, set
+	ignore_overlay_strings_at_pos_p if dpvec came from an overlay
+	string, so we skip those overlay strings at current pos.
+
[phone]  Lars Hansen <[e-mail]>
+
+	* fileio.c (file-regular-p): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (valid_lisp_object_p): New function to validate that
+	an object is really a valid Lisp_Object.
+
+	* lisp.h (valid_lisp_object_p): Add prototype.
+
+	* print.c (safe_debug_print): New function to be called from gdb
+	to print Lisp objects; use valid_lisp_object_p to avoid crashing
+	if user tries to print something which is not a Lisp object.
+
+	* .gdbinit (pp, pp1): Use safe_debug_print.
+	(pv, pv1): New commands to print value of a lisp variable.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* .gdbinit (pp1): New user-defined function.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* image.c [MAC_OSX] (image_load_quartz2d): Fix memory leak.
+
+	* mac.c [MAC_OSX] (init_mac_osx_environment): Reinitialize locale
+	related variables for dumped executable.
+
+	* unexmacosx.c (unexec_write_zero): New function.
+	(copy_data_segment): Clear uninitialized local variables in
+	statically linked libraries.
+
+	* s/darwin.h (C_SWITCH_SYSTEM): Remove -fno-common.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* keymap.c (shadow_lookup): If Flookup_key returns a number,
+	call it again with a sub-key-sequence, and if its return value
+	is non-nil (sub-key is bound), return nil.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fsignal_process): Recognize signal names with and
+	without SIG prefix, e.g. SIGHUP and HUP.
+
+	* search.c (search_buffer): No need to initialize base_pat.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Fget_lru_window, Fget_largest_window, window_loop):
+	Don't abuse the `mini' arg.  Use the `obj' arg instead.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (show_mouse_face): Clear mouse face to eol.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): Add emacs-lisp/syntax.elc,
+	font-lock.elc and jit-lock.elc.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fenlarge_window): Rename SIDE to HORIZONTAL.
+	(enlarge_window): Rename WIDTHFLAG to HORIZ_FLAG.
+	(CURBEG, CURSIZE): Use HORIZ_FLAG instead of WIDTHFLAG.
+
+	* sheap.c (STATIC_HEAP_SIZE): Increment both definitions.
+
+	* alloc.c (refill_memory_reserve): Move decl out of conditionals.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Fdisplay_buffer): Fix last change to not use
+	a dedicated window.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (update_window_fringes): Undo 2005-10-27 change.
+	Instead, rotate the bottom angle bitmap 180 degrees to indicate
+	that the bottom row does not end in a newline.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* unexelf.c (unexec): Handle .plt section in BSS segment.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (readevalloop): Yet another int/Lisp_Object mixup (YAILOM).
+
+	* window.c (window_loop): For LRU and LARGEST, let the `mini' argument
+	determine whether to consider dedicated windows as well.
+	(Fget_lru_window, Fget_largest_window): Add `dedicated' argument.
+	(Fdisplay_buffer): Do consider dedicated windows in those cases where
+	we will split the window rather than reuse it.
+	Don't try to use windows on other displays.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increment to 1170000.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* macfns.c: Update copyright year.
+	* m/gould.h: Likewise.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (display_line): Restore it->current_x and call
+	extend_face_to_end_of_line when last glyph doesn't fit on line.
+	(set_glyph_string_background_width): Remove specific tests  here
+	to see if face background should extend to end of line.  Simplify.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* alloc.c (BYTES_USED): Use uordblks, not arena.
+	(bytes_used_when_reconsidered): New variable.
+	(emacs_blocked_free): Set that.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* alloc.c (emacs_blocked_free): Fix typo.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* data.c (Fmake_variable_frame_local): Doc fix.
+
+	* xdisp.c (handle_fontified_prop): Do nothing if memory full.
+	(format_mode_line_unwind_data): New arg SAVE_PROPTRANS
+	controls whether to save and restore mode_line_proptrans_alist.
+	Callers changed.
+	(unwind_format_mode_line): Work with that feature.
+	(redisplay_internal): Don't call prepare_menu_bars if memory full.
+	(move_elt_to_front): New function.
+	(display_mode_element): Use move_elt_to_front.
+	Don't bother munging text props on a null string.
+	Delete obsolete elts from mode_line_proptrans_alist.
+	(decode_mode_spec): Test Vmemory_full, not spare_memory.
+	(Fformat_mode_line): Clear mode_line_proptrans_alist after saving.
+
+	* lisp.h (memory_full_cons_threshold): Declare.
+	(internal_lisp_condition_case): Declare.
+
+	* alloc.c (syms_of_alloc) <memory-full>: Doc fix.
+	(Fmemory_full_p): Function deleted.
+	(syms_of_alloc): Don't defsubr it.
+	(memory_full_cons_threshold): New variable.
+	(spare_memory): Now a vector of 7 elts.
+	(buffer_memory_full): Don't set Vmemory_full here.
+	(xfree): Don't try to refill here.
+	(emacs_blocked_free): Record BYTES_USED in local var.
+	(memory_full): Now free all the slots in spare_memory.
+	(refill_memory_reserve): Allocate each slot in spare_memory.
+	(init_alloc_once): Call refill_memory_reserve.
+
+	* keyboard.c (command_loop_1): Don't set Vmemory_full here.
+
+	* eval.c (internal_lisp_condition_case): New function.
+	(Fcondition_case): Use internal_lisp_condition_case.
+	(Feval): Test Vmemory_full and memory_full_cons_threshold.
+	(Ffuncall): Likewise.
+
+	* bytecode.c (Fbyte_code): Use internal_lisp_condition_case.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (Fparse_partial_sexp): Fix docstring.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increment to 1130000.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfns.c (syms_of_xfns): Provide `x' as feature.
+
+	* xdisp.c (decode_mode_spec): Define %e to indicate memory full.
+
+	* editfns.c (Fformat): Don't include string padding
+	between info[n].start and info[n].end.
+
+	* alloc.c (spare_memory): No longer static.
+	(xfree) [!SYSTEM_MALLOC]: Call refill_memory_reserve.
+
+	* puresize.h (BASE_PURESIZE): Increment to 1120000.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* data.c (Fmake_variable_frame_local): Add clarification to docstring.
+
+	* fringe.c (update_window_fringes): Handle case where buffer ends
+	with a newline.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.h (DECODE_SYSTEM): Fix argument name; name->str.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* charset.h (charset_mule_unicode_0100_24ff)
+	(charset_mule_unicode_2500_33ff, charset_mule_unicode_e000_ffff):
+	Extern them.
+
+	* charset.c (charset_mule_unicode_0100_24ff)
+	(charset_mule_unicode_2500_33ff, charset_mule_unicode_e000_ffff):
+	New variables.
+	(Fsetup_special_charsets): Initialize them.
+
+	* xterm.c (handle_one_xevent): Handle keysyms directly mapped to
+	supported Unicode characters.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (w32_to_x_font): Avoid forcing font widths.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* image.c [MAC_OS] (image_load_qt_1): Check image size.
+	Use GraphicsImportGetImageDescription instead of
+	GraphicsImportGetNaturalBounds.
+	[MAC_OSX] (image_load_quartz2d): Check image size.
+	[MAC_OS] (xpm_load_image): Likewise.
+
+	* macterm.c (last_mouse_glyph_frame): New var.
+	(note_mouse_movement): Say mouse moved if current frame differs
+	from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+	(XTmouse_position): Set last_mouse_glyph_frame.
+	(XTread_socket): Clear last_mouse_glyph_frame on mouse up/down event.
+	(mac_draw_string_common) [USE_ATSUI && WORDS_BIG_ENDIAN]: Fix typo.
+	Use EndianU16_BtoN.
+	(mac_draw_string_common) [MAC_OSX]: Don't use ATSUClearLayoutControls.
+	(x_per_char_metric, XLoadQueryFont)
+	[MAC_OS_X_VERSION_MAX_ALLOWED < 1020]: Use device origins to get
+	glyph bounds.
+	(mac_to_x_fontname, mac_do_list_fonts)
+	(mac_initialize_display_info): Change screen resolutions to 72dpi.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* minibuf.c (Fdisplay_completion_list): Small doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c: Undo 2005-10-23 change.
+	(last_mouse_glyph_frame): New var.
+	(note_mouse_movement): Say mouse moved if current frame differs
+	from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+	(XTmouse_position): Set last_mouse_glyph_frame.
+	(handle_one_xevent): Clear last_mouse_glyph_frame [instead of
+	last_mouse_glyph] on mouse up/down event.
+
+	* editfns.c (Fcompare_buffer_substrings): Fix last change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* editfns.c (Fcompare_buffer_substrings): Handle multibyte chars.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (note_mouse_movement): Always call note_mouse_highlight
+	so tool tips don't interfere with press on tool bar button.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* casetab.c (Fset_case_table): Doc fix.
+
+	* lread.c (build_load_history): Replace STREAM arg with ENTIRE.
+	(readevalloop): Compute ENTIRE properly.
+	(syms_of_lread) <load-history>: Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (Fload): Simplify gcpro structure.
+	Gcpro FOUND as well as FILE, but not EFOUND.
+	Unless preloading, record FOUND instead of FILE in Vload_history.
+	Rename repeat local FILE to MSG_FILE.
+	(syms_of_lread) <load-history>: Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* search.c (boyer_moore): Add parens to fix and/or precedence bug.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.c (clone_per_buffer_values): Remove unused var tem.
+	(init_buffer): Remove unused vars dotstat, pwdstat.
+
+	* ccl.c (check_ccl_update): Remove unused var vp.
+
+	* fileio.c (auto_save_error): Call SAFE_FREE.
+
+	* fns.c (Fchar_table_range): Remove unused var i.
+
+	* minibuf.c (display_completion_list_1): New wrapper function
+	for Fdisplay_completion_list.
+	(Fminibuffer_completion_help): Use it.
+
+	* term.c (encode_terminal_code): Remove unused var src_start.
+
+	* window.c (Fwindow_tree): Remove unused var alist.
+
+	* xterm.c (x_calc_absolute_position): Remove unused vars win_x, win_y.
+
[phone]  Aubrey Jaffer  <[e-mail]>  (tiny change)
+
+	* unexelf.c (unexec): Fix calls to `fatal' with less than 3 arguments.
+
[phone]  Olli Savia  <[e-mail]>  (tiny change)
+
+	* syssignal.h [__Lynx__]: Undef SIGPOLL along with SIGIO.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* minibuf.c (Fdisplay_completion_list): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* image.c (check_image_size): Handle integer Vmax_image_size value
+	directly as max pixel value.  Use default frame size for null frame.
+	(syms_of_image) <max-image-size>: Describe integer value.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* emacs.c (main): Update copyright year.
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* image.c (Vmax_image_size): New variable.
+	(check_image_size): New function.
+	(xbm_read_bitmap_data, pbm_load, png_load, jpeg_load, tiff_load)
+	(gif_load, gs_load): Use it.
+	(lookup_image): Try loading again if previous load failed.
+	(xbm_read_bitmap_data): Add a new argument, a pointer to the frame
+	to display in, NULL if none.
+	(xbm_load_image, xbm_file_p): Pass xbm_read_bitmap_data the new
+	argument.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (Fstring_match): Doc fix.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (note_mouse_movement): Use PtInRect.
+	(XTread_socket): Also ignore mouse motion just before a button
+	release event.  Don't process button release event when mouse is
+	not grabbed.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* minibuf.c (Fdisplay_completion_list): Add new optional
+	argument COMMON_SUBSTRING.  Bind `completion-common-substring'
+	to the optional argument during running `completion-setup-hook'.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c [TARGET_API_MAC_CARBON] (get_cfstring_encoding_from_lisp):
+	Allow nil as argument.
+	 [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Regard nil
+	for encoding arguments as UTF-16 in native byte order, no BOM.
+
+	* macfns.c (Fx_create_frame): Add debugging code.
+	(Fx_show_tip): Set frame pixel width and height.
+
+	* macterm.c (MAC_WINDOW_NORMAL_GC): Remove macro.
+	(FRAME_NORMAL_GC): New macro.
+	(mac_draw_line, mac_clear_area, mac_clear_window)
+	(mac_fill_rectangle, mac_draw_string, mac_draw_string_16)
+	(mac_draw_image_string, mac_draw_image_string_16): Rename from
+	XDrawLine, XClearArea, XClearWindow, XFillRectangle, XDrawString,
+	XDrawString16, XDrawImageString, and XDrawImageString16, respectively.
+	All uses changed.
+	(mac_draw_line, mac_erase_rectangle, mac_clear_area)
+	(mac_clear_window, mac_draw_bitmap, mac_draw_rectangle)
+	(mac_invert_rectangle, mac_draw_string_common, mac_draw_string)
+	(mac_draw_string_16, mac_draw_image_string)
+	(mac_draw_image_string_16, mac_copy_area, mac_copy_area_with_mask)
+	(mac_scroll_area): Drawing functions now take frame as destination.
+	All uses changed.
+	(mac_draw_string_common): Get port height with FRAME_PIXEL_HEIGHT.
+	(x_draw_fringe_bitmap): Set clipping area in face->gc.
+
+	* macterm.h (mac_clear_area): Add extern.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (note_mouse_movement, XTread_socket): Apply 2005-10-14
+	changes for xterm.c.
+
+	* w32term.c (note_mouse_movement, w32_read_socket): Likewise.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* search.c (search_buffer): Give up BM search on case-fold-search
+	if one of a target character has a case-equivalence of different
+	charset even if that target charcter is an ASCII.
+
+	* casefiddle.c (casify_object): Fix for the case that case
+	conversion change the byte length.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (note_mouse_movement): Return 1 if mouse moved; 0 otherwise.
+	(handle_one_xevent): Only clear help_echo_string; restore it if
+	note_mouse_movement didn't record any mouse movement.
+
+	* xdisp.c (pos_visible_p): Convert w->hscroll to pixels before use.
+	(remember_mouse_glyph): Clear RECT if mouse is over an image glyph.
+
+	* keyboard.c (make_lispy_position): Adjust wx for left margin if ON_TEXT.
+	(Fposn_at_x_y): Fix calculation of x coordinate.
+	(Fposn_at_point): Return nil if point is hscrolled out of view.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* sysdep.c (request_sigio, unrequest_sigio): Do nothing in
+	non-interactive mode.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* xterm.c, w32term.c, macterm.c (note_mouse_movement): Undo last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): Clear last_mouse_glyph on mouse up/down.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* buffer.c (init_buffer): Rename `rc' to `len' for clarity.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* xdisp.c (remember_mouse_glyph): Use MATRIX_BOTTOM_TEXT_ROW to
+	get end of text rows.  Obtain header-line/mode-line rows directly.
+
+	* xterm.c, w32term.c, macterm.c (note_mouse_movement):
+	Restore help_echo_string if mouse is moved inside last_mouse_glyph.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (remember_mouse_glyph): New generic version based on
+	glyph_rect and remember_mouse_glyph from xterm.c enhanced to
+	properly handle all different window areas.
+
+	* dispextern.h (remember_mouse_glyph): Add prototype.
+
+	* xterm.c (glyph_rect, remember_mouse_glyph): Remove X versions.
+	(note_mouse_movement, XTmouse_position): Use generic
+	remember_mouse_glyph, add last_mouse_glyph arg.
+
+	* w32term.c (note_mouse_movement): Fix last_mouse_glyph check.
+	(glyph_rect, remember_mouse_glyph): Remove w32 specific versions.
+	(note_mouse_movement, w32_mouse_position): Use generic
+	remember_mouse_glyph, add last_mouse_glyph arg.
+
+	* macterm.c (note_mouse_movement): Add call to remember_mouse_glyph.
+	(glyph_rect, remember_mouse_glyph): Remove mac specific versions.
+	(XTmouse_position): Adapt to use generic remember_mouse_glyph
+	instead of pixel_to_glyph_coords.
+
+	* window.c (coordinates_in_window): Fix x position for ON_RIGHT_MARGIN.
+	Fix x position for ON_TEXT when left margin width > 0.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (coordinates_in_window): Fix y position for ON_SCROLL_BAR.
+
+	* keyboard.c (make_lispy_position): Fix buffer calculations for
+	mouse click or movement in right fringe and the margins.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* image.c (fn_jpeg_stdio_src): Don't define it.
+	(init_jpeg_functions): Don't initialize `fn_jpeg_stdio_src'.
+	(our_common_init_source): Rename from `our_init_source'.
+	(our_common_term_source): Rename from `our_term_source'.
+	(our_memory_fill_input_buffer): Rename from
+	`our_fill_input_buffer'.
+	(our_memory_skip_input_data): Rename from `our_skip_input_data'.
+	(jpeg_memory_src): Use the new names.
+	(struct jpeg_stdio_mgr): New struct.
+	(JPEG_STDIO_BUFFER_SIZE): New constant.
+	(our_stdio_fill_input_buffer, our_stdio_skip_input_data)
+	(jpeg_file_src): New functions.
+	(jpeg_load): Use `jpeg_file_src' instead of `fn_jpeg_stdio_src'.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (PER_CHAR_METRIC): Remove unused macro.
+	(fm_font_family_alist): New variable.
+	(syms_of_macterm): Initialize and staticpro it.
+	(decode_mac_font_name): Replace '-' in family name with '_' if it
+	occurs just once.  Lower family name.
+	(parse_x_font_name): Rename from x_font_name_to_mac_font_name.
+	All uses changed.  Remove argument MF and code conversion for it.
+	Add argument SIZE.  Rename argument MF_DECODED to FAMILY, and CS
+	to CHARSET.  Parse font size.  Lower family name.  Return integer
+	value for status of parsing.
+	(init_font_name_table) [USE_ATSUI]: Use decode_mac_font_name.
+	Don't use Fdowncase because family name is already lowered by
+	decode_mac_font_name.
+	(init_font_name_table): Always call decode_mac_font_name.
+	Add pair of family name and its reference to fm_font_family_alist.
+	(mac_clear_font_name_table): Clear fm_font_family_alist.
+	(XLoadQueryFont): Move font size parsing part to parse_x_font_name.
+	Lookup fm_font_family_alist to get font family reference.
+	(XLoadQueryFont) [USE_ATSUI]: Don't use Fdowncase because family
+	name is already lowered by parse_x_font_name.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (glyph_rect): Return 0 if position is outside text area.
+
+	* keyboard.c (make_lispy_position): Fix buffer position calculation for
+	mouse click or movement in fringe.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xterm.c (remember_mouse_glyph): New function.
+	(note_mouse_movement): Use it to remember the current glyph if changed.
+	(XTmouse_position): Fix calculation of fake glyph under mouse.
+	Move code to calculate glyph under mouse into remember_mouse_glyph.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* emacs.c (USAGE3, standard_args): -nb => -nbi.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* frame.c (Fredirect_frame_focus): Fix typos in docstring.
+	(next_frame, prev_frame, set_term_frame_name): Make static.
+
+	* window.c (Fwindow_tree): Fix spelling.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* window.c (Fwindow_end): Don't try to redisplay if non-interactive.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* emacs.c (standard_args): Remove options -i, -itype, --icon-type.
+	Add options -nb, --no-bitmap-icon.
+
+	* xfns.c (Fx_create_frame): Make bitmapIcon have default on.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macgui.h (MAX_CLIP_RECTS): New define.
+	(struct _XGC): New member clip_region.
+	(struct _XGC) [MAC_OSX && USE_ATSUI]: New members n_clip_rects and
+	clip_rects.
+
+	* macterm.c (GC_CLIP_REGION): New macro.
+	(saved_port_clip_region): New variable.
+	(mac_begin_clip, mac_end_clip): New functions.
+	(XDrawLine, mac_erase_rectangle, mac_draw_bitmap, XFillRectangle)
+	(mac_draw_rectangle, mac_draw_string_common, mac_copy_area)
+	(mac_copy_area_with_mask, mac_scroll_area): Use them.
+	(mac_set_clip_rectangle, mac_reset_clipping): Remove functions.
+	[USE_ATSUI] (atsu_get_text_layout_with_text_ptr)
+	[MAC_OS_X_VERSION_MAX_ALLOWED < 1020]: Specify kATSLineFractDisable.
+	(mac_draw_string_common) [MAC_OSX && USE_ATSUI]: Clip to clipping
+	rectangles stored in gc.
+	(XFreeGC): Dispose of clipping region.
+	(mac_set_clip_rectangles, mac_reset_clip_rectangles): New functions.
+	(x_draw_fringe_bitmap, x_set_glyph_string_clipping)
+	(x_draw_relief_rect, x_draw_box_rect, x_draw_stretch_glyph_string)
+	(x_draw_glyph_string, x_clip_to_row, x_draw_hollow_cursor)
+	(x_draw_bar_cursor): Use them.
+	(x_set_glyph_string_clipping): Use get_glyph_string_clip_rects to
+	get multiple clipping rectangles.
+
+	* macterm.h (mac_term_init): Add types to extern.
+	(struct mac_output): Remove members mWP and pending_menu_activation.
+	Put members scroll_bar_foreground_pixel and
+	scroll_bar_background_pixel in #if 0.
+	(FRAME_MAC_WINDOW, FRAME_X_WINDOW): Use window_desc.
+
+	* xfaces.c (x_create_gc, x_free_gc) [MAC_OS]: Add BLOCK_INPUT.
+	Add debugging code.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (window_tree, Fwindow_tree): Rename fns added 2005-10-04.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (redraw_overlapped_rows, redraw_overlapping_rows)
+	[!HAVE_WINDOW_SYSTEM]: Don't declare them...
+	(update_window) [!HAVE_WINDOW_SYSTEM]: ...and don't call them.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* dispextern.h (struct glyph_string): Rename member for_overlaps_p
+	to for_overlaps.  Now occupy 3 bits.
+	(OVERLAPS_PRED, OVERLAPS_SUCC, OVERLAPS_BOTH)
+	(OVERLAPS_ERASED_CURSOR): New defines.
+	(struct redisplay_interface): Add new OVERLAPS arg to member
+	fix_overlapping_area.
+	(x_fix_overlapping_area): Add new OVERLAPS arg.
+	(get_glyph_string_clip_rects): Add extern.
+
+	* dispnew.c (redraw_overlapping_rows):
+	Call rif->fix_overlapping_area with new OVERLAPS arg as redrawn part.
+
+	* xdisp.c: Rename member for_overlaps_p in struct glyph_string to
+	for_overlaps.
+	(get_glyph_string_clip_rects): New function created from
+	get_glyph_string_clip_rect.  Set clipping rectangles according to the
+	value of for_overlaps.  Enable to store multiple clipping rectangles.
+	(get_glyph_string_clip_rect): Use get_glyph_string_clip_rects.
+	(fill_composite_glyph_string, fill_glyph_string, draw_glyphs):
+	Rename argument OVERLAPS_P to OVERLAPS.  All uses in macros changed.
+	(x_fix_overlapping_area): Add OVERLAPS arg.  Pass it to draw_glyphs.
+	(draw_phys_cursor_glyph): Set width of erased cursor to use it for
+	calculating clipping rectangles later.  Call x_fix_overlapping_area
+	with new OVERLAPS arg to draw only erased cursor area.
+	(expose_overlaps): Call x_fix_overlapping_area with new OVERLAPS arg
+	to draw overlaps in both preceding and succeeding rows.
+
+	* xterm.c, w32term.c, macterm.c: Rename member for_overlaps_p in
+	struct glyph_string to for_overlaps.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* alloc.c (refill_memory_reserve): Conditionalize the body,
+	not the function's existence.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (window_split_tree): New function.
+	(Fwindow_split_tree): New defun.
+	(syms_of_window): Defsubr it.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_invert_rectangle): New function.
+	(XTflash): Use it.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* regex.h (re_char): Don't expose it in the interface.
+	(re_set_whitespace_regexp): Adjust the arg's type to not use it.
+
+	* regex.c (re_char): Move it back here.
+	(re_set_whitespace_regexp): Change the arg's type to not use it.
+
+	* keyboard.c (make_lispy_event): If point has moved between down and up
+	event, make it a drag, not a click, to mirror what
+	mouse-drag-region expects.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* lisp.h (fatal): Undo previous change.
+	* term.c (fatal): Undo previous change.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfaces.c (face_color_gray_p): Colors close to black count as gray.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (try_window): Skip scroll-margin check if ZV is visible.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c (init_keyboard) [MAC_OSX]: Don't install SIGINT handler.
+
+	* macfns.c (start_hourglass): Apply 2005-05-07 change for xfns.c.
+	(x_create_tip_frame) [GLYPH_DEBUG]: Uncomment debugging code.
+	(Fx_create_frame, x_create_tip_frame) [USE_ATSUI]:
+	Try ATSUI-compatible 12pt Monaco font first.
+
+	* macgui.h (struct _XCharStruct): New member valid_p.
+	(STORE_XCHARSTRUCT): Set valid_p.
+	(struct MacFontStruct) [USE_ATSUI]: New member mac_style.
+
+	* macterm.c (mac_draw_string_common, x_per_char_metric)
+	(mac_compute_glyph_string_overhangs, init_font_name_table)
+	(XLoadQueryFont, mac_unload_font) [USE_ATSUI]: Add ATSUI support.
+	(atsu_get_text_layout_with_text_ptr) [USE_ATSUI]: New function.
+	(x_draw_glyph_string_background)
+	(x_draw_glyph_string_foreground) [MAC_OS8 && USE_ATSUI]: Don't use
+	XDrawImageString.  Always draw background and foreground separately.
+	(x_draw_glyph_string_foreground) [USE_ATSUI]: Don't use 8-bit
+	functions for one-byte chars when using ATSUI-compatible fonts.
+	(atsu_font_id_hash) [USE_ATSUI]: New variable.
+	(syms_of_macterm) [USE_ATSUI]: Initialize and staticpro it.
+	(XLoadQueryFont): Set min_byte1, max_byte1, min_char_or_byte2, and
+	max_char_or_byte2 more in detail.
+	(quit_char_comp, mac_check_for_quit_char) [MAC_OSX]: Remove functions.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct type.
+	* xterm.c (handle_one_xevent, handle_one_xevent): Likewise.
+
+	* unexelf.c (fatal): Fix prototype.
+
+	* term.c (fatal): Implement using varargs.
+
+	* regex.c (re_char): Move typedef ...
+	* regex.h (re_char): ... here.
+	(re_iswctype, re_wctype, re_set_whitespace_regexp): New prototypes.
+
+	* emacs.c (malloc_set_state): Fix return type.
+	(endif): Fix type.
+
+	* lisp.h (fatal): Add argument types.
+
+	* dispextern.h (fatal): Delete prototype.
+
+	* systime.h: (make_time): Prototype moved from ...
+	* editfns.c (make_time): ... here.
+
+	* editfns.c: Move systime.h include after lisp.h.
+	* dired.c:
+	* xsmfns.c:
+	* process.c: Likewise.
+
+	* alloc.c (old_malloc_hook, old_realloc_hook, old_realloc_hook):
+	Add parameter types.
+	(__malloc_hook, __realloc_hook, __free_hook): Fix prototypes.
+	(emacs_blocked_free): Change definition to match __free_hook.
+	(emacs_blocked_malloc): Change definition to match __malloc_hook.
+	(emacs_blocked_realloc): Change definition to match __realloc_hook.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* minibuf.c (Fread_buffer): Follow convention for reading from the
+	minibuffer with a default value.  Doc fix.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* editfns.c (Fmessage, Fmessage_box, Fmessage_or_box):
+	Rename argument name `string' to `format-string'.
+	(Fformat): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* image.c (gif_load): Fix size of allocated image buffer
+	for images where a sub-image may be larger than the image's
+	total height/width specifications.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macgui.h (struct _XCharStruct): Each member now takes short value.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* xfaces.c (lookup_derived_face): Add parameter type.
+
+	* xdisp.c (cursor_row_fully_visible_p): Add parameter type.
+
+	* marker.c (verify_bytepos): Add parameter type.
+
+	* process.c (get_operating_system_release): Move prototype ...
+
+	* systime.h (get_operating_system_release): ... here.
+
+	* xterm.c (handle_one_xevent): Refer to union field to match the
+	type required by the function definition.
+	(set_vertical_scroll_bar): Move prototype ...
+
+	* xterm.h: ... here.
+
+	* fns.c (internal_equal, seed_random): Fix prototypes.
+	(internal_equal): Add missing parameter.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (update_menu_bindings): Variable deleted.
+	(syms_of_keyboard): Don't defvar it.
+	(parse_menu_item): Don't test it.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fformat): Explicitly test for end of format string
+	and don't use `index'.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* s/aix4-2.h (BROKEN_GET_CURRENT_DIR_NAME):
+	Define BROKEN_GET_CURRENT_DIR_NAME.
+
+	* sysdep.c (get_current_dir_name): Also define if
+	BROKEN_GET_CURRENT_DIR_NAME.
+
+	* m/ibmrs6000.h: Test for USG5, not USG5_4.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (message_dolog): Add warning about GC and Lisp strings.
+	(message2): Fix commentary.  Ok to use alloca'ed memory.
+	Still not ok to use Lisp string data (because of GC).
+	(set_message): Add comment why GC cannot happen.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (xlfdpat_block_match_1): Fix assertion.
+	(init_font_name_table) [TARGET_API_MAC_CARBON]: Don't add style
+	variants for a scalable font multiple times.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* process.c (create_process) [RTU || UNIPLUS || DONT_REOPEN_PTY]:
+	Setup slave tty options before forking.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
+	positions have been set for the frame (as is done for frames in
+	special-display-buffer-names).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Fformat): Don't scan past end of format string that
+	ends in %.  Reported by: Johan Bockg,Ae(Brd.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* window.h (struct window): Remove height_fixed_p, no longer set.
+
+	* window.c (make_window): Don't initialize height_fixed_p.
+	(window_fixed_size_p): Don't use it.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* data.c (Fdefalias): Signal an error if SYMBOL is not a symbol.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* Makefile.in (SOME_MACHINE_OBJECTS): Undo previous change.
+
+	* macfns.c (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
+	New variables.
+	[TARGET_API_MAC_CARBON] (Fx_file_dialog): Don't allow multiple
+	file selection.
+
+	* sysdep.c [MAC_OS8]: Don't include stdlib.h.  Include sys/param.h.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.
+	(obj): Use XMENU_OBJ, not a literal xmenu.o.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* fileio.c (syms_of_fileio) <write-region-inhibit-fsync>: Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (overlay_arrow_at_row): Add HAVE_WINDOW_SYSTEM conditional.
+	(display_mode_element): Instead of `lisp_string' and `this',
+	record `offset' and increment that.
+	`last_offset' replaces `last'.
+
+	* Makefile.in (XMENU_OBJ): Variable deleted.
+	(obj): Use xmenu.o unconditionally.
+	(SOME_MACHINE_OBJECTS): Delete xmenu.o.
+
+	* emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_vertically): Don't try to fetch byte BEGV-1.
+	(reseat_at_next_visible_line_start): Likewise (in xassert).
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* fileio.c (write_region_inhibit_fsync): New variable.
+	(Fwrite_region): Use it to skip call to fsync.
+	(syms_of_fileio): Initialize it.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_region_unwind): Argument format changed.
+	(run_pre_post_conversion_on_str): If pre-write-conversion function
+	changed the current buffer, delete the new buffer.
+	(run_pre_write_conversin_on_c_str): Likewise.
+
+	* fileio.c (Fexpand_file_name): Check multibyteness of
+	default_directory.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* composite.c (compose_chars_in_text): Delete it.
+
+	* composite.h (compose_chars_in_text): Delete extern.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* print.c (print_error_message): Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* composite.c (compose_chars_in_text): Fix setup of `pend'.
+	Unconditionally reload `ptr' and `pend' after eval.
+
+	* xdisp.c (message3): Pass copy of lisp string to message_dolog.
+
+	* print.c (print_error_message): Pass copy of caller name to
+	message_dolog.
+
+	* fileio.c (auto_save_error): Pass copy of lisp string to message2.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (display_mode_element): Be sure to make variables THIS
+	and LISP_STRING point into a string data of ELT.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Ftranslate_region_internal): Reload `tt' after
+	signal_after_change that may have GC'ed.
+	(Fmessage, Fmessage_box, Fmessage_or_box): Doc fix.
+
+	* keymap.c (Fdescribe_buffer_bindings): Reload `translate'
+	after insert while runs signal_after_change.
+
+	* minibuf.c (Fminibuffer_complete_word): Move `completion_string'
+	declaration to where it is used.
+
+	* w32.c (check_windows_init_file): Fix allocation of error buffer.
+
+	* xfns.c (x_encode_text): Declare static.  Add FREEP arg.
+	(x_set_name_internal): Call x_encode_text with new FREEP arg to
+	know if xfree is needed instead of guessing.
+
+	* xterm.h (x_encode_text): Remove prototype.
+
[phone]  Chris Prince  <[e-mail]>  (tiny change)
+
+	* w32term.c (x_bitmap_icon): Load small icons too.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* buffer.c (init_buffer): Grow buffer to add directory separator
+	and terminal zero.  Fix typos.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* buffer.c (init_buffer): Fix error message for failed call to
+	get_current_dir_name.
+	(get_current_dir_name): Remove prototype.
+
+	* xsmfns.c: (get_current_dir_name): Remove prototype.
+
+	* lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
+	Add prototype.
+
+	* sysdep.c [WINDOWSNT]: Add prototype for getwd.
+	Don't #undef NULL after including blockinput.h.
+
+	* config.in: Regenerated.
+
[phone]  Giuseppe Scrivano  <[e-mail]>
+
+	Remove the MAXPATHLEN limitations:
+
+	* sysdep.c (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
+	New function.
+
+	* buffer.c (init_buffer): Use it.
+
+	* xsmfns.c (smc_save_yourself_CB): Ditto.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* doc.c (Fsubstitute_command_keys): Lookup key binding for
+	commands that are remapped from some other command.
+
+	* xdisp.c (try_window_reusing_current_matrix): Clear mode_line_p
+	flag in disabled rows below the window.
+
+	* frame.h (struct frame): New member updated_p.
+
+	* xdisp.c (redisplay_internal): Mark updated frames in new updated_p
+	member.  Remove local `updated' array and associated variables.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (handle_display_prop): Respect overlay window property.
+
+	* xdisp.c (try_window): Remove superfluous cursor_height calculation.
+	Fixes crash reported by YAMAMOTO Mitsuharu.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (struct xlfdpat_block, struct xlfdpat): New structs.
+	(xlfdpat_destroy, xlfdpat_create, xlfdpat_exact_p)
+	(xlfdpat_block_match_1, xlfdpat_match): New functions.
+	(xlfdpat_block_match): New macro.
+	(mac_to_x_fontname): Don't use tolower for non-ASCII characters.
+	(x_font_name_to_mac_font_name): Set coding.dst_multibyte to 0.
+	(add_font_name_table_entry): Increase font_name_table_size more
+	rapidly.
+	(mac_c_string_match): Remove function.
+	(mac_do_list_fonts): Use XLFD pattern match instead of regular
+	expression match.
+
+	* xfaces.c (xstrlwr): Don't use tolower for non-ASCII characters.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (redisplay_internal): Make UPDATED as long as needed.
+	(move_it_in_display_line_to): Stop after last char on line even
+	on a windowing terminal, if that's the specified stop position.
+
+	* fns.c (Fsort): Doc fix.
+
+	* editfns.c (Fpropertize): Don't insist that properties be symbols.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* dired.c (directory_files_internal_unwind, directory_files_internal)
+	(file_name_completion): Use a Save_Value object rather than a cons of
+	two 16bit ints to store the DIR*.
+	(directory_files_internal, file_name_completion): Handle both EINTR and
+	EAGAIN consistently after `readdir'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* intervals.c (update_interval): Add position info in error.
+
+	* dispnew.c (window_to_frame_hpos, update_window):
+	Avoid gcc warning about unused variable `f'.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (add_menu_item): If unicode_append_menu returns an
+	error, revert to using AppendMenu.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* image.c (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument.
+	All uses changed.
+	[MAC_OS] (XPutPixel, XGetPixel): Add efficient versions for common
+	cases.
+	(x_create_x_image_and_pixmap) [MAC_OS]: Don't call x_destroy_x_image.
+	[MAC_OS] (find_image_fsspec) [!MAC_OSX]: Don't use FSRef.
+	Use posix_pathname_to_fsspec.
+	[MAC_OS] (xpm_load_image): Fill in background_transparent field
+	while we have mask.
+
+	* macgui.h [!TARGET_API_MAC_CARBON] (GetPixDepth): New define.
+
+	* macterm.h (PIX_MASK_DRAW, PIX_MASK_RETAIN): Move defines to image.c.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (update_syntax_table): Properly reproduce the special +1
+	setting of e_property at the end of the buffer when bumping into the
+	INTERVALS_AT_ONCE limit.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* emacs.c (USAGE1): Fix the description of the -Q option.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (pos_visible_p): Yet another int/Lisp_Object mixup (YAILOM).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (resize_mini_window): Fix 2005-08-20 change.
+	Don't move PT to new window start.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_get_event) [MAC_OS]: Make events for
+	ICONIFY/DEICONIFY_EVENT.
+
+	* macterm.c (mac_copy_area, mac_copy_area_with_mask):
+	Restore background color.
+	(mac_handle_visibility_change): New function.
+	(x_make_frame_invisible, x_iconify_frame)
+	(XTread_socket) [!USE_CARBON_EVENTS]: Use it.
+	[USE_CARBON_EVENTS] (mac_handle_window_event)
+	(install_window_handler): Handle visibility change events.
+	(x_make_frame_visible): Don't reposition window if it is iconified
+	or asked for visible before.  Select and uncollapse window when it
+	is made visible.
+	(x_make_frame_invisible): Don't reset x_highlight_frame.
+	(x_iconify_frame): Likewise.  Make invisible frame visible before
+	it is iconified.
+	(read_socket_inev): Move variable outside #if USE_CARBON_EVENTS.
+	(do_window_update): Don't change visibility of invisible frame.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* term.c (turn_on_face): Check for TS_set_foreground and
+	TS_set_background depending on standout_mode.  Simplify.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (update_window_fringes): Only put TOP and BOTTOM
+	bitmaps on fully visible rows.
+
+	* fringe.c (update_window_fringes): Replace FORCE_P arg with
+	KEEP_CURRENT_P arg; if non-zero, don't update current row fringes,
+	and return 0.
+
+	* xdisp.c (redisplay_window): Call update_window_fringes with
+	KEEP_CURRENT_P non-0 if we are going to refresh fringes later.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (display_echo_area_1): Get display start pos from w->start.
+	(resize_mini_window): Set w->start, and PT, so as to display the tail
+	end of the buffer, if it doesn't all fit.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (calc_pixel_width_or_height): Use actual display
+	resolution when available instead of Vdisplay_pixels_per_inch.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (pos_visible_p): Adjust X value if window is hscrolled.
+
+	* dispnew.c (buffer_posn_from_coords): Check that target row is
+	within matrix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_wm_set_icon_pixmap): Move GTK specific code to
+	xg_set_frame_icon and call it.
+
+	* gtkutil.c (xg_set_frame_icon): New function.
+
+	* gtkutil.h (xg_set_frame_icon): Declare it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (increment_row_positions): Skip non-enabled rows.
+
+	* window.c (SAVED_WINDOW_VECTOR_SIZE): Remove dangerous define.
+	(Fcurrent_window_configuration): Use VECSIZE macro instead.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (message3_nolog): Clear echo_message_buffer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lisp.h (QUIT) [!SYNC_INPUT]: Throw t to Vthrow_on_input.
+
+	* process.c (deactivate_process, status_notify, read_process_output)
+	(update_status, status_convert, decode_status, allocate_pty)
+	(make_process, remove_process, list_processes_1)
+	(create_process_1, unwind_request_sigio, read_process_output)
+	(send_process, keyboard_bit_set): Declare static.
+	(Fdelete_process): Simplify.  Pass process to status_notify, so we
+	don't try to read output from it.
+	(status_notify): New arg deleting_process--don't try to read
+	output from that process.
+
+	* lisp.h (deactivate_process, status_notify, read_process_output):
+	Remove prototypes.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* image.c (syms_of_image): Init Qxbm, Qpbm before calling
+	define_image_type.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
+	(xg_get_image_for_pixmap): Move some code to
+	xg_get_pixbuf_from_pix_and_mask, and call it.
+
+	* gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare.
+
+	* xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask
+	to get an GTK icon and set it with GTK functions to avoid having GTK
+	override an icon set with just X functions.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* image.c (syms_of_image): Init image_types here, and call
+	define_image_type.
+	(init_image): Not here.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* bytecode.c (BYTE_CODE_QUIT): Throw t to Vthrow_on_input.
+
+	* lisp.h (QUIT): Throw t to Vthrow_on_input.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* floatfns.c (Fexpt): Use floats for negative exponent.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
+	should not be there, causing menu display errors with GTK 2.6.9.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* floatfns.c (Fexpt): Undo previous change.
+
+	* dispnew.c (Fframe_or_buffer_changed_p): Take an arg
+	so it can be used with various state vectors.
+
+	* emacs.c (endif): Convert -script into -scriptload.
+	(standard_args): Add -scriptload.  Allow -basic-display with one dash.
+
+	* fns.c (syms_of_fns): Add `emacs' to features.
+
+	* term.c (set_terminal_modes): If no TS_termcap_modes string,
+	output newlines to scroll the old screen contents off the screen.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* floatfns.c (Fexpt): Use floats for negative exponent.
+	Reported by D Goel.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* frame.c (Fframe_char_width): Doc fix.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp) <redisplay-end-trigger-functions>:
+	Defvar it.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* w32fns.c (my_set_window_pos, my_show_window): Don't declare.
+	(my_create_window, my_create_tip_window): Make static.
+
+	* w32term.c (my_show_window, my_set_window_pos, my_set_focus)
+	(my_set_foreground_window, my_destroy_window): Make static.
+
[phone]  Paul Eggert  <[e-mail]>
+
+	Merge gnulib getopt implementation into Emacs.
+
+	* s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
+	now part of lib-src.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Fdefvar): Allow (defvar enable-multibyte-characters).
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (w32_menu_display_help): Suppress tooltip when
+	navigating menus with the keyboard.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* insdel.c (syms_of_insdel): staticpro combine_after_change_buffer.
+
+	* bytecode.c (MAYBE_GC): Test gc_cons_threshold and
+	gc_relative_threshold, one by one.
+
+	* keyboard.c (read_char): Test gc_cons_threshold.
+	(syms_of_keyboard): staticpro Qecho_area_clear_hook.
+
+	* eval.c (Feval, Ffuncall): Test gc_cons_threshold and
+	gc_relative_threshold, one by one.
+
+	* alloc.c (gc_cons_threshold): Not static.
+	(gc_cons_combined_threshold): Var deleted.
+	(gc_relative_threshold): New variable.
+	(Fgarbage_collect, init_alloc_once): Compute gc_relative_threshold
+	instead of gc_cons_combined_threshold.
+
+	* lisp.h (gc_cons_threshold, gc_relative_threshold): Declare.
+	(gc_cons_combined_threshold): Declaration deleted.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c: Don't include stdlib.h or string.h.
+	(Fdo_applescript, Fmac_file_name_to_posix)
+	(Fmac_file_name_to_posix): Doc fixes.
+	[TARGET_API_MAC_CARBON] (Fmac_get_preference)
+	(Fmac_code_convert_string): Likewise.
+	[MAC_OSX] (init_mac_osx_environment): Fall back on terminal mode
+	if the executable is not contained in a bundle.
+
+	* macfns.c: Don't include stdlib.h or string.h.  Include atimer.h.
+	(gray_width, gray_height): Remove defines.
+	(gray_bits, gray_bitmap_width, gray_bitmap_height)
+	(gray_bitmap_bits): Remove variables.
+	(lispy_function_keys): Remove extern.
+	(free_frame_menubar): Add extern.
+	(x_window_to_frame): Remove function.
+	(unwind_create_tip_frame): Add declaration.
+	(x_set_name_internal): New function.
+	(x_set_name, x_set_title): Use it.
+	(Fx_create_frame, Fx_display_grayscale_p, Fx_display_pixel_width)
+	(Fx_display_pixel_height, Fx_display_planes)
+	(Fx_display_color_cells, Fx_server_max_request_size)
+	(Fx_server_vendor, Fx_server_version, Fx_display_screens)
+	(Fx_display_mm_height, Fx_display_mm_width)
+	(Fx_display_backing_store, Fx_display_visual_class)
+	(Fx_display_save_under, Fx_synchronize, Fx_show_tip): Doc fixes.
+
+	* macmenu.c (Fx_popup_menu, Fx_popup_dialog): Doc fixes.
+
+	* macselect.c (Fx_own_selection_internal): Follow error conventions.
+	(Fx_get_selection_internal, Fx_selection_owner_p)
+	(Fx_selection_exists_p): Doc fixes.
+	(syms_of_macselect) <selection-converter-alist>: Likewise.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
+	* ccl.c (Fregister_ccl_program): Fix typos in docstring.
+	(Fccl_execute_on_string): Likewise; add usage info.
+
+	* composite.c (Fcompose_region_internal)
+	(Fcompose_string_internal):
+	Improve argument/docstring consistency.
+
+	* minibuf.c (Fminibuffer_prompt_end, Feval_minibuffer):
+	Fix typos in docstrings.
+
+	* textprop.c (Fnext_char_property_change)
+	(Fprevious_char_property_change): Doc fixes.
+
+	* window.c (Fset_window_margins, Fset_window_fringes):
+	Improve argument/docstring consistency.
+
+	* xfaces.c (Finternal_lisp_face_p): Doc fix.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* eval.c (restore_stack_limits): Return a value.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* eval.c (Fdefvar): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fileio.c (Fdo_auto_save, do_auto_save_unwind):
+	Use make_save_value to unwind protect stream.
+
+	* lread.c (Fload, load_unwind):
+	Use make_save_value to unwind protect stream.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* eval.c (Fprog2, Fcalled_interactively_p),
+	(syms_of_eval) <debug-on-quit>: Doc fixes.
+	(syms_of_eval) <max-specpdl-size>:
+	(Finteractive_p): Fix typos in docstrings.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* w32fns.c (Vx_hand_shape): Variable removed.
+	(syms_of_w32fns): Intern and staticpro Qw32_charset_default.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (Fstring_as_multibyte): Escape backslashes in the docstring.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* buffer.h (Fgenerate_new_buffer_name): Declare (for use in coding.c).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* frame.h (struct frame): New member already_hscrolled_p.
+
+	* xdisp.c (redisplay_internal): Only try to hscroll each frame once
+	to avoid redisplay looping hscrolling back and forth ad infinitum.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* buffer.c (scroll-up-aggressively, scroll-down-aggressively):
+	* keymap.c (Fminor_mode_key_binding):
+	* macterm.c (mac-emulate-three-button-mouse):
+	Delete duplicate duplicate words.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* minibuf.c (Ftest_completion): Fix odd syntax in test.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (x_set_cursor_color): Use XSetBackground and XSetForeground.
+
+	* macgui.h (struct _XGC): New struct.
+	(GC): Use it.
+	(GCForeground, GCBackground, GCFont): Use X11 mask values.
+	(XCreateGC, XParseGeometry): Move externs to macterm.h.
+
+	* macterm.c (x_bitmap_icon, x_make_frame_visible): Remove declarations.
+	(XSetFont): Add declaration.
+	(mac_set_forecolor, mac_set_backcolor, mac_set_colors):
+	Remove functions.
+	(GC_FORE_COLOR, GC_BACK_COLOR, GC_FONT, MAC_WINDOW_NORMAL_GC):
+	New defines.
+	(XDrawLine, mac_draw_line_to_pixmap, XClearWindow)
+	(mac_draw_bitmap, XCreatePixmapFromBitmapData, XFillRectangle)
+	(mac_draw_rectangle, mac_draw_string_common, mac_scroll_area):
+	Use them.
+	(mac_erase_rectangle): New function.
+	(XClearArea, x_draw_fringe_bitmap, x_clear_glyph_string_rect)
+	(x_draw_stretch_glyph_string): Use it.
+	(XChangeGC, XCreateGC, XGetGCValues, XSetForeground)
+	(XSetBackground, XSetFont): Adjust for new GC implementation.
+	(x_draw_fringe_bitmap, x_draw_box_rect): Use GC to set colors.
+	(XTset_vertical_scroll_bar): Clear area under scroll bar.
+
+	* macterm.h (struct mac_display_info): Change types of
+	scratch_cursor_gc black_relief.gc, and white_relief.gc to GC.
+	(XCreateGC, XParseGeometry): Move externs from macgui.h.
+
+	* xfaces.c [MAC_OS] (XCreateGC): Remove extern.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fmake_overlay): Doc fix.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32proc.c (syms_of_ntproc): staticpro Qhigh, Qlow,
+	Vw32_valid_locale_ids, and Vw32_valid_codepages.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c [TARGET_API_MAC_CARBON] (Fmac_code_convert_string):
+	Use Fstring_as_unibyte instead of string_make_unibyte.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (select_frame_for_redisplay): Use find_symbol_value.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c: Fix redisplay loop in last change.
+	(IT_POS_VALID_AFTER_MOVE_P): New macro.
+	(move_it_vertically_backward, move_it_by_lines): Use it.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32.c (init_environment): Default HOME directory to user's
+	appdata directory if possible.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* .gdbinit (pitx): Fix output format.  Print string charpos.
+
+	* lread.c (syms_of_lread): Initialize seen_list.
+
+	* search.c (syms_of_search): Staticpro searchbuf.whitespace_regexp.
+
+	* syntax.c (syms_of_syntax): Staticpro lisp objects in gl_state.
+	Staticpro re_match_object.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macselect.c (get_scrap_target_type_list): Avoid NULL pointer
+	dereference.
+
+	* macterm.c (mac_window_to_frame): Remove duplicate define.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_region_unwind): ARG is changed to a cons.
+	(code_convert_region): Adjust for the above change.
+	(set_conversion_work_buffer): If the work buffer is already in
+	use, generate a new buffer and return it.  Otherwise return Qnil.
+	(run_pre_post_conversion_on_str): Adjust for the above change.
+	(run_pre_write_conversin_on_c_str): Likewise.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (start_display): Don't reseat to next visible line start
+	if current start position is in a string or image.
+	(move_it_vertically_backward): Be sure to move out of strings and
+	images when moving it2 forward.
+	(move_it_by_lines): When moving forward, move to next buffer
+	position if we end up in a string or image.  When moving backward,
+	count rows moved over when moving to start of current row in case
+	row starts in middle of a string or image.  Also move further
+	backward if we end up in a string or image.
+	(try_cursor_movement): If overlay string spans multiple lines,
+	move backward to set cursor on start of an overlay string.
+	(cursor_row_p): Row is ok if cursor is at newline from string, but
+	string starts on this line (so we always position cursor at start
+	of string).
+
+	* indent.c (Fvertical_motion): If start position is on an image,
+	don't move back if we move too far (that's almost certain to happen).
+
+	* xdisp.c (cursor_row_fully_visible_p): Allow partially visible
+	row in minibuffer windows.
+	(try_window): Don't check margins in minibuffer windows.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c: Don't include stdlib.h or composite.h.
+	(x_use_underline_position_properties, last_mouse_press_frame)
+	(x_noop_count, Qvendor_specific_keysyms): Remove unused variables.
+	(syms_of_macterm, mac_initialize): Don't initialize them.
+	(waiting_for_input, initial_argv, initial_argc)
+	(Vcommand_line_args, Vx_no_window_manager, errno, window_scroll)
+	(set_frame_menubar, path_from_vol_dir_name): Remove externs.
+	(extra_keyboard_modifiers): Fix type in extern.
+	(x_window_to_frame, x_window_to_scroll_bar): Remove declarations.
+	(x_scroll_bar_report_motion): Add argument types to declaration.
+	(mac_compute_glyph_string_overhangs): Add declaration.
+	(disable_mouse_highlight): Remove unused variable.
+	[USE_TOOLKIT_SCROLL_BARS] (construct_scroll_bar_click)
+	(x_scroll_bar_handle_press, x_scroll_bar_handle_release)
+	(x_scroll_bar_handle_drag): Remove argument `timestamp'.
+	All callers changed.
+	[USE_TOOLKIT_SCROLL_BARS] (construct_scroll_bar_click): Don't set
+	timestamp.
+	[USE_CARBON_EVENTS] (mac_handle_mouse_event): Likewise.
+	(x_scroll_bar_create, XTset_vertical_scroll_bar): Show scroll bar
+	only when its width is less than the height.
+	(XTredeem_scroll_bar): Sync with xterm.c.
+	(font_name_table, font_name_table_size, font_name_count):
+	Make static.
+	(drag_and_drop_file_list): Remove variable.  Previous use is now
+	local to function.
+	(do_ae_open_documents): Move DRAG_N_DROP event construction part
+	from XTread_socket.
+	(XTread_socket): Consolidate setting of event timestamp.
+	Move DRAG_N_DROP event construction part to do_ae_open_documents.
+	Support extra_keyboard_modifiers.
+
+	* xfaces.c (try_font_list) [MAC_OS]: Try font family name
+	beginning with that for ASCII.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (gc_cons_combined_threshold, Vgc_cons_percentage): New vars.
+	(Fgarbage_collect, init_alloc_once): Set gc_cons_combined_threshold.
+	(syms_of_alloc): Declare gc-cons-percentage.
+
+	* eval.c (Feval, Ffuncall):
+	* keyboard.c (read_char):
+	* bytecode.c (MAYBE_GC): Use gc_cons_combined_threshold.
+
+	* lisp.h (gc_cons_combined_threshold): Declare.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* coding.c (Qprocess_argument):
+	* coding.h (Qprocess_argument): Remove unused var.
+
+	* xselect.c (intern): Remove dup. intern and staticpro for QTIMESTAMP.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c [!TARGET_API_MAC_CARBON]: Include charset.h, coding.h, and
+	Endian.h.
+	[!MAC_OSX] (fchmod, fchown): New functions.
+	(mac_get_code_from_arg): Don't accept Lisp integer as argument.
+	Use SBYTES and EndianU32_BtoN.
+	(mac_get_object_from_code): Return 4 byte string even if argument
+	is 0.  Use make_unibyte_string and EndianU32_NtoB.
+	(Fmac_get_file_creator, Fmac_get_file_type, Fmac_set_file_creator)
+	(Fmac_set_file_type): Fix documents and argument declarations.
+	Don't specify kFSCatInfoNodeFlags.  Support Mac OS Classic.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfaces.c (x_update_menu_appearance): Use fontSet resource for
+	Lucid if X_I18N, font otherwise.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* mac.c (Fmac_get_file_type, Fmac_get_file_creator): Add.
+	(Fmac_set_file_type, Fmac_set_file_creator): Add.
+	(mac_get_object_from_code, mac_get_code_from_arg): Add.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (Qeval_buffer_list, Veval_buffer_list): New vars.
+	(syms_of_lread): Set up eval-buffer-list.
+	(Feval_buffer, Feval_region): Bind eval-buffer-list.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (Fdefvar): Allow defvaring a constant to itself quoted.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (menu_bar_items): Don't GCPRO menu_bar_items_vector here.
+	(syms_of_keyboard): Initialize and staticpro menu_bar_items_vector.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (Frecenter): Fix last change (set iarg before use).
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Frecenter): When arg is inside the scroll margin,
+	move it out of the margin.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32console.c (initialize_w32_display): Detect when the console
+	dimensions are insane, and default to 80x25 instead.
+	(w32_use_full_screen_buffer): Default to NIL.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_draw_vertical_window_border): Use foreground of
+	VERTICAL_BORDER_FACE_ID for vertical border line.
+	(mac_encode_char): Call check_ccl_update in advance.
+	(mac_to_x_fontname, x_font_name_to_mac_font_name)
+	(init_font_name_table, mac_do_list_fonts, XLoadQueryFont):
+	Don't assume that font family length is less than 32.
+	(x_compute_min_glyph_bounds): Make static.
+	(x_load_font): Never set fonts_changed_p to zero.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* Update FSF's address in GPL notices.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (try_window): Fix previous change in how it handles
+	a partially-visible line or one only partly past the margin.
+
+	* window.c (window_scroll_pixel_based): Take account
+	of this_scroll_margin when finding point when scrolling up.
+
[phone]  Ralf Angeli  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based, window_scroll_line_based):
+	Handle `scroll-preserve-screen-position' non-nil, non-t specially.
+	(syms_of_window): <scroll-preserve-screen-position>: Doc fix.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* w32term.c (w32_draw_vertical_window_border): Use foreground of
+	VERTICAL_BORDER_FACE_ID for vertical border line.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* fileio.c (Fcopy_file): Rearrange the code that calls fchown and
+	fchmod so that chmod doesn't get called on MSDOS before the file
+	is closed.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (cleartype_active): New flag for enabling sub-pixel
+	workaround.
+	(w32_initialize): Initialize it.
+	(w32_native_per_char_metric): Allow a couple of extra pixels when
+	Cleartype is active.
+
+	* w32term.c (w32_initialize): Move check for screen reader here
+	from syms_of_w32term.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): bzero compose_status when nbytes
+	is not zero.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* emacs.c (main): Passing ADD_NO_RANDOMIZE to `personality'.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* xdisp.c (x_draw_vertical_border): If left fringe is not present
+	decrease x coord of vertical border by 1 pixel to not occupy text
+	area of the right window.
+
+	* xterm.c (x_draw_vertical_window_border): Use foreground of
+	VERTICAL_BORDER_FACE_ID for vertical border line.
+
+	* term.c (turn_on_face): In standout mode apply specified
+	fg to bg, and specified bg to fg (this makes the logic of
+	inversion on terminal consistent with X).
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* eval.c (user_variable_p_eh): New function.
+	(Fuser_variable_p): Use it.  Clarify docstring.
+	Return t for aliases of user options, nil for alias loops.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (Fdefvar): Improve error message.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Fix last
+	change.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* eval.c (Fdefvar): Don't try to set constant symbols.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* macfns.c (Fx_show_tip): Pass new arg to try_window.
+
+	* w32fns.c (Fx_show_tip): Pass new arg to try_window.
+
+	* xfns.c (Fx_show_tip): Pass new arg to try_window.
+
+	* xdisp.c (try_window): New arg CHECK_MARGINS.  Calls changed.
+	(redisplay_window): Handle try_window reporting point in scroll margin.
+
+	* dispextern.h (try_window): Declare new arg.
+
+	* fileio.c (Fcopy_file): New arg PRESERVE_UID_GID.
+	Use fchmod to copy the file modes.
+	(Frename_file): Don't copy UID and GID here;
+	instead, specify t for PRESERVE_UID_GID when calling Fcopy_file.
+
+	* eval.c (call_debugger): Take full care of extending stack limits
+	to make space for the debugger, and restore the change afterward.
+	Bind debug-on-error to nil.
+	(restore_stack_limits): New subroutine.
+	(Fsignal): Extend specpdl bound along with eval depth bound,
+	for calling edebug.  Don't do either one, for calling debugger.
+	(find_handler_clause): Don't bind debug-on-error here.
+	Don't unbind anything either.
+	Temporarily advance max_specpdl_size for calling
+	internal_with_output_to_temp_buffer.
+	(grow_specpdl): Don't alter max_specpdl_size before signaling
+	an error.
+	(syms_of_eval) <max-specpdl-size>: Doc fix.
+
+	* lread.c (read1): 0.0e+NaN should make a "positive" NaN.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* fileio.c (Frename_file): Undo last change: no need to ifdef away
+	chown on DOS_NT platforms.
+
+	* w32.c (sys_chown): New function.
+
+	* s/ms-w32.h (chown): New; define to sys_chown.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
+	(syms_of_xdisp) <void-text-area-pointer>: Doc fix.
+
+	* fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Finish reversing the tests of
+	Vnobreak_char_display.
+
+	* xdisp.c (Vnobreak_char_display): Rename from Vshow_nonbreak_escape.
+	All uses changed.
+	(Qnobreak_space): Rename from Qno_break_space.  All uses changed.
+	(syms_of_xdisp): Define nobreak-char-display and nobreak-space.
+
+	* fileio.c (Frename_file): Preserve owner and group, if possible,
+	when copying.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* abbrev.c (Funexpand_abbrev):
+	* category.c (Fmake_category_set):
+	* dispnew.c (Fsleep_for, Fsit_for):
+	* editfns.c (Fsubst_char_in_region):
+	* eval.c (Fdefvar, Fdefconst, Feval, Ffuncall):
+	* frame.c (make_frame_without_minibuffer):
+	* lread.c (read_vector):
+	* macfns.c (check_x_frame):
+	* process.c (Fstop_process, Fcontinue_process):
+	* search.c (Freplace_match):
+	* syntax.c (Fstring_to_syntax):
+	* w32fns.c (check_x_frame, check_x_display_info):
+	* xfaces.c (x_supports_face_attributes_p):
+	* xselect.c (Fx_own_selection_internal): Follow error conventions.
+
+	* image.c (fn_png_init_io): Don't define it.
+	(init_png_functions) [HAVE_NTGUI]: Don't initialize fn_png_init_io.
+	(png_read_from_file): New function, based on png_read_from_memory.
+	(png_load): Use it, instead of fn_png_init_io.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* search.c (Fmatch_data): Remove evaporate option.
+	(Fset_match_data): Do not mention evaporate option in doc string.
+	Add commentary explaining evaporate arg (for internal use only).
+	(unwind_set_match_data): Add comment on evaporate use.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (Qvertical_border): Rename from `Qvertical_divider'.
+	(realize_basic_faces, syms_of_xfaces): Update references to it.
+	* dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID'
+	to `VERTICAL_BORDER_FACE_ID'.
+	* dispnew.c (build_frame_matrix_from_leaf_window): Update references.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* dispextern.h: Add extern Qframe_set_background_mode.
+
+	* xfaces.c: Rename obsolete function Qframe_update_face_colors to
+	Qframe_set_background_mode.
+
+	* frame.c (Fmodify_frame_parameters):
+	Call frame-set-background-mode after changing the background color
+	on non-window non-dos branch.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* fns.c (Fchar_table_range):
+	* process.c (Fmake_network_process): Fix spellings.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (Fsort): Doc fix.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (Qvertical_divider): New variable.
+	(realize_basic_faces): Realize its face.
+	(syms_of_xfaces): Initialize it.
+
+	* dispextern.h (enum face_id): Add `VERTICAL_DIVIDER_FACE_ID'.
+
+	* dispnew.c (build_frame_matrix_from_leaf_window): Display vertical
+	window-separator on ttys using `vertical-divider' face by default.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element):
+	Reverse test of Vshow_nonbreak_escape.
+
+	* term.c (produce_special_glyphs): Use spec_glyph_lookup_face.
+	(Ftty_no_underline): New function.
+	(syms_of_term): defsubr it.
+
+	* keyboard.c (read_char): Call restore_getcjmp after jump occurs.
+
+	* dispnew.c (spec_glyph_lookup_face): New function.
+	(build_frame_matrix_from_leaf_window): Use it.
+
+	* dispextern.h (spec_glyph_lookup_face): Add declaration.
+
+	* buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (read_char): After catching a longjmp,
+	call restore_getcjmp.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xselect.c (lisp_data_to_selection_data): Fix spelling.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_compute_glyph_string_overhangs): Don't set
+	overhangs unless the given glyph type is noncomposite CHAR_GLYPH.
+	[USE_CARBON_EVENTS] (mac_convert_event_ref): Convert dead key down
+	events.
+	(XTread_socket): Don't pass keyboard events with the option
+	modifier to the system when Vmac_command_key_is_meta is nil or
+	Vmac_option_modifier is non-nil.
+	[USE_CARBON_EVENTS] (read_socket_inev): New variable.
+	[USE_CARBON_EVENTS] (init_command_handler): Fix argument.
+	[USE_CARBON_EVENTS] (mac_handle_mouse_event): New Carbon event
+	handler function.
+	(install_window_handler) [USE_CARBON_EVENTS]: Install it.
+	(XTread_socket) [USE_CARBON_EVENTS]: Move mouse wheel event
+	handler part to mac_handle_mouse_event.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* eval.c (Fdefvaralias): Rename arguments SYMBOL and ALIASED to
+	NEW-ALIAS and BASE-VARIABLE, respectively.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup.
+	(get_phys_cursor_geometry, format_mode_line_unwind_data)
+	(get_line_height_property, x_produce_glyphs): Remove unused vars.
+
+	* coding.c (run_pre_post_conversion_on_str): Remove unused var `buf'.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32term.c (x_use_underline_position_properties): New variable.
+	(x_draw_glyph_string): Remind in a comment to change doc string of
+	x-use-underline-position-properties if/when underline positioning
+	is implemented.
+	(syms_of_w32term): DEFVAR_BOOL x-use-underline-position-properties,
+	and initialize it to nil.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (NEWOPENFILENAME): New struct.
+	(Fx_file_dialog): Use it to trick the system into giving us up to
+	date dialogs on systems that are documented to support it.
+	Do not set OFN_FILEMUSTEXIST flag if looking for a directory.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32fns.c (w32_abort): Use the MB_YESNO dialog instead of
+	MB_ABORTRETRYIGNORE.  Never return, even if DebugBreak does.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* image.c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
+	to CreateDIBSection to avoid a compiler warning.
+	(pbm_load): Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler
+	warning.
+	(png_load): Cast return values of fn_png_create_read_struct and
+	fn_png_create_info_struct, to avoid compiler warnings on W32.
+	Cast 3rd arg to IMAGE_BACKGROUND and image_background_transparent
+	to avoid compiler warnings.
+	(jpeg_load): Cast return value of fn_jpeg_std_error to avoid a
+	compiler warning on W32.  Cast 3rd arg to IMAGE_BACKGROUND to
+	avoid a compiler warning.
+	(tiff_load): Cast return values of fn_TIFFOpen and
+	fn_TIFFClientOpen to avoid compiler warning on W32.  Cast 3rd arg
+	to IMAGE_BACKGROUND to avoid a compiler warning.
+	(gif_load): Cast return values of fn_DGifOpenFileName and
+	fn_DGifOpen to avoid compiler warnings on W32.  Cast 3rd arg to
+	IMAGE_BACKGROUND to avoid a compiler warning.
+	(DrawText) [HAVE_NTGUI || MAC_OS]: If already defined, undef
+	before redefining.
+
+	* w32bdf.c (create_offscreen_bitmap): Cast `bitsp' to `void **' in
+	the call to CreateDIBSection, to avoid a compiler warning.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (Fx_file_dialog): Unblock input before falling back to
+	minibuffer.
+	* macfns.c (Fx_file_dialog): Likewise.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* makefile.w32-in ($(TEMACS)): Depend on addsection.exe.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* process.c (syms_of_process) [ADAPTIVE_READ_BUFFERING]:
+	* w32fns.c (syms_of_w32fns): Fix spellings.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* unexw32.c (COPY_CHUNK, COPY_PROC_CHUNK): Add a new argument
+	`verbose'; print diagnostic messages only if it is non-zero.
+	All callers changed to pass a zero value unless DEBUG_DUMP is defined
+	in the environment.
+	(copy_executable_and_dump_data): Print section names with %.8s.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face
+	when mouse_face is not given.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* window.c (Fselect_window): Adapt call to Fselect_frame.
+
+	* lisp.h: Update EXFUN of Fselect_frame.
+
+	* keyboard.c (command_loop_1): Adapt call to Fselect_frame.
+
+	* frame.c (Fhandle_switch_frame, Fselect_frame): Delete unused arg
+	no_enter.
+	(Fset_mouse_position, Fset_mouse_pixel_position, Ficonify_frame):
+	Adapt to above change.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* fns.c (Fmemq, Fmaphash): Doc fixes.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xfaces.c (Fdisplay_supports_face_attributes_p):
+	Fix typo in docstring.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section
+	used by gcc4 on intel mac.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* search.c (Fmatch_data): Add optional RESEAT arg.  Unchain markers
+	in REUSE list if non-nil; free them if equal to evaporate.
+	(Fset_match_data): Add optional RESEAT arg.  Unchain markers in	LIST
+	if non-nil; free them if equal to evaporate.  Use XCAR/XCDR.
+	(restore_search_regs): Rename from restore_match_data.  Uses changed.
+	(unwind_set_match_data): New function.
+	(record_unwind_save_match_data): New function like save-match-data.
+
+	* lisp.h (Fmatch_data, Fset_match_data): Fix EXFUN.
+	(record_unwind_save_match_data): Add prototype.
+	(restore_search_regs): Rename from restore_match_data.
+
+	* composite.c (compose_chars_in_text):
+	* eval.c (do_autoload):
+	* macmenu.c (set_frame_menubar):
+	* process.c (read_process_output, exec_sentinel):
+	* xmenu.c (set_frame_menubar):
+	* xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar):
+	* w32menu.c (set_frame_menubar):
+	Use record_unwind_save_match_data.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Alter previous change:
+	Distinguish Vshow_nonbreak_escape = t or not t.
+	For t, use escape_glyph once again, as before previous change.
+	Use space or hyphen for display, instead of the non-ASCII char.
+	(syms_of_xdisp) <show-nonbreak-escape>: Doc fix.
+
+	* process.c (Fstart_process): Don't touch command_channel_p slot.
+
+	* process.h (struct process): Delete command_channel_p.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight):
+	Check the overlapping of re-rendering area to avoid flickering.
+	(note_mouse_highlight): Call clear_mouse_face if PART
+	is not ON_MODE_LINE nor ON_HEADER_LINE.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c: Improve commentary for adaptive read buffering.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars
+	if available.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* macmenu.c (menu_quit_handler, install_menu_quit_handler):
+	New functions for popping down menus on C-g.
+	(set_frame_menubar, mac_menu_show): Call install_menu_quit_handler.
+
+	* macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode
+	non-static.
+
+	* config.in: Add HAVE_CANCELMENUTRACKING.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove macros.
+
+	* unexw32.c (RVA_TO_PTR): Move here from w32heap.h.
+
+	* w32proc.c (RVA_TO_PTR): New macro.
+
+	* w32heap.c (RVA_TO_PTR): No need to #undef now.
+
+	* makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)):
+	Depend on w32heap.h.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keyboard.c (command_loop_1): Update Vthis_original_command.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Undo previous change.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* xdisp.c (Qno_break_space): New variable.
+	(syms_of_xdisp): Initialize it.
+	(get_next_display_element): Add no-break space and soft hypen
+	codes for iso8859-2 and iso8859-5.  Don't add `\' for them.
+	Use `no-break-space' face for no-break spaces.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* window.c (delete_window): Handle the case where a h/vchild has
+	a h/vchild.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32.c (sys_setsockopt): Change arg 4 to `const void *'.  In the
+	call to pfn_setsockopt, cast optval to `const char *'.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32.c (gettimeofday): Use struct _timeb, not struct timeb.
+	(open_unc_volume): Cast return value of map_w32_filename, to avoid
+	compiler warnings.
+
+	* s/ms-w32.h (fileno): Don't define if already defined.
+
+	* emacs.c: Include w32heap.h, to avoid compiler warning about sbrk.
+
+	* makefile.w32-in (DOC): Define to point to the generated DOC-X.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Click not in menu deactivates menu.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* macmenu.c (cleanup_popup_menu): New function.
+	(Fx_popup_menu): Unwind protect cleanup_popup_menu in case
+	mac_menu_show Quit:s.
+	(mac_menu_show): Quit on cancel if not popped up on click (i.e.
+	a dialog).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* coding.c (decode_coding_string): Handle CODING_FINISH_INTERRUPT.
+
+	* callproc.c (Fcall_process): Don't use alloca to gradually
+	increase size of buf, as it effectively uses twice the necessary
+	space on the stack.  Instead, pre-allocate buf of full size, and
+	gradually increase the read size.
+
+	* bytecode.c (BYTE_CODE_QUIT): Check Vthrow_on_input.
+
+	* eval.c (unbind_to): Preserve value of Vquit_flag.
+
+	* xterm.c (handle_one_xevent): Also ignore mouse motion just
+	before a button release event.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xfaces.c (Finternal_lisp_face_equal_p): Really report
+	on faces in a frame, if the argument FRAME is non-nil.
+	Improve argument/docstring consistency.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (MODE_LINE_NOPROP_LEN): New macro.
+	(x_consider_frame_title, Fformat_mode_line): Save offset into
+	mode_line_noprop_buf rather than pointer, in case buffer is relocated.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (mapcar1): Maybe exit loop if original sequence was modified.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_to_x_fontname, mac_do_list_fonts): Set XLFD
+	resolution fields for scalable fonts to 0.
+
+	* xfaces.c (build_scalable_font_name): Round pixel size to the
+	nearest integer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (display_mode_line): Support nested calls to redisplay
+	and format-mode-line.  Set mode_line_target to MODE_LINE_DISPLAY.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents):
+	* xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (mode_line_noprop_buf, mode_line_noprop_buf_end)
+	(mode_line_noprop_ptr): Rename from frame_title_*.
+	(store_mode_line_noprop_char): Rename from store_frame_title_char.
+	(store_mode_line_noprop): Rename from store_frame_title.
+	(mode_line_target): New enum to specify current output target
+	for mode line formatting.
+	(display_mode_element): Test it rather than frame_title_ptr and
+	mode_line_string_list to determine where output should go.
+	(mode_line_proptrans_alist, mode_line_string_alist): Make static.
+	(Vmode_line_unwind_vector): New variable.
+	(format_mode_line_unwind_data, unwind_format_mode_line):
+	New functions for unwind protection in mode line formatting.
+	(x_consider_frame_title): Use them and new local var 'title_start'
+	to support nested calls to format-mode-line and redisplay.
+	Set mode_line_target to MODE_LINE_TITLE.
+	(Fformat_mode_line): Use them and new local var 'string_start' to
+	support nested calls to format-mode-line and redisplay.
+	Set mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING.
+	Don't trim trailing dashes.
+	(decode_mode_spec): Don't make infinite number of trailing dashes
+	for MODE_LINE_NOPROP and MODE_LINE_STRING targets.
+	(syms_of_xdisp): Initialize and staticpro mode_line_string_face,
+	mode_line_string_face_prop, and Vmode_line_unwind_vector.
+	(init_xdisp): Initialize mode_line_noprop_ptr to start of _buf.
+	Initialize mode_line_target to MODE_LINE_DISPLAY.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fbuffer_local_value): Call indirect_variable.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Change the
+	pointer to a hand cursor when hoovering over a mouse-face.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xterm.c (x_encode_char): Call check_ccl_update in advance.
+
+	* ccl.c: Now an element of Vccl_program_table is a vector of
+	length 4, not 3.
+	(ccl_get_compiled_code): New arg idx.  Caller changed.
+	Adjust for the change of Vccl_program_table.
+	(setup_ccl_program): Adjust for the change of Vccl_program_table.
+	(check_ccl_update): New function.
+	(Fregister_ccl_program): Use ASET to set an element of a vector.
+	Adjusted for the change of Vccl_program_table.
+
+	* ccl.h (struct ccl_program): New member idx.
+	(check_ccl_update): Extern it.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* image.c (Vimage_library_alist): Move from image.el.
+	(syms_of_image): Defvar it.
+	(lookup_image_type): Use it.
+
+	* buffer.c (Fbuffer_local_value): Make argument name match its use
+	in docstring.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keyboard.c (Frecursive_edit): Fix typo in docstring.
+	(Fposn_at_x_y): Make argument name match its use in docstring.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* eval.c (Frun_hooks): Mention run-mode-hooks in docstring.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Use b and e
+	as loop sentinels.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* xmenu.c (Fx_popup_dialog): Add a third boolean argument to
+	select frame title ("Question"/"Information").
+	(xdialog_show): Use it.
+
+	* macmenu.c (Fx_popup_dialog, mac_dialog_show): As for xmenu.c.
+
+	* w32menu.c (Fx_popup_dialog, w32_dialog_show): As for xmenu.c.
+
+	* fns.c (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
+	a third argument (Qnil).
+
+	* lisp.h: x-popup-dialog can have three arguments.
+
+	* editfns.c (Fmessage_box): Use "Information" for frame title.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* termcap.c [VMS]: Include <starlet.h>.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Add code
+	for mouse-face.  Change the type of the first argument from `window'
+	to `Lisp_Object'.
+	(note_mouse_highlight): Call note_mode_line_or_margin_highlight with
+	window instead of w.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* process.c (send_process): Move misplaced volatile.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (display_mode_element): If we're processing a list and
+	padding is specified, put it after the last element.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name) [DOS_NT]: Don't try to support
+	"superroot" on DOS_NT systems.
+
[phone]  David Hunter  <[e-mail]>  (tiny change)
+
+	* process.c (send_process): Restore the SIGPIPE handler if we
+	catch a SIGPIPE.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* image.c (lookup_image, png_read_from_memory): Remove hacks (and
+	misleading comments).
+	(DEF_IMGLIB_FN): Use C calling convention for image libraries.
+
[phone]  KOBAYASHI Yasuhiro  <[e-mail]>
+
+	* window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges):
+	Correct the right value.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* keyboard.c (syms_of_keyboard): Remove Lisp variables
+	post-command-idle-hook and post-command-idle-delay.
+	(command_loop_1): Don't try to execute post-command-idle-hook.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (handle_display_prop): Handle empty replacement.
+	(handle_single_display_spec): Return -1 for empty replacement.
+
+	* keyboard.c (adjust_point_for_property): Skip empty overlay string.
+
+	* .gdbinit (pitx): Print more info about iterator.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* unexmacosx.c (unexec_realloc): Move declarations before statements.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (message3): Call cancel_echoing.
+
+	* alloc.c (Fmemory_full_p): New function.
+	(syms_of_alloc): defsubr it.
+
+	* process.c (send_process_trap): Unblock SIGPIPE.
+	(send_process): Reset SIGPIPE handler before reporting error.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* emacs.c (syms_of_emacs): Fix doc string for system-type.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Ffind_file_name_handler): Handle lambda-exp as handler.
+	(Finsert_file_contents): If we read 0 bytes from a special file,
+	unlock the visited file if we locked it.
+	(Fmake_symbolic_link, Frecent_auto_save_p): Doc fixes.
+	(Ffile_exists_p, Ffile_symlink_p): Doc fixes.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
+
+	* keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]:
+	Regard toolkit scroll bar thumb drag events as squeezable and prevent
+	redisplay from being paused by them.
+
+	* mac.c [!MAC_OSX]: Include keyboard.h and syssignal.h.
+	[!MAC_OSX] (target_ticks): Remove variable.
+	[!MAC_OSX] (check_alarm, pause, index): Remove functions.
+	[!MAC_OSX && __MRC__] (sys_strftime): Likewise.
+	[!MAC_OSX] (select): If fd 0 is not set in rfds and some input
+	event occurs before timeout, behave as if the function were interrupted.
+	[!MAC_OSX] (sigblock, sigsetmask, alarm): Simulate SIGALRM
+	handling using Time Manager routines.
+	[!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask):
+	New variables.
+	[!MAC_OSX] (mac_atimer_handler, set_mac_atimer, remove_mac_atimer)
+	(setitimer): New functions.
+
+	* macfns.c, macmenu.c: Don't include signal.h.
+
+	* macterm.c [USE_TOOLKIT_SCROLL_BARS] (get_control_part_bounds):
+	Rename from get_control_part_bound.  All callers changed.
+	(x_scroll_bar_clear): New function.
+	(x_clear_frame): Use it.
+	(XTset_vertical_scroll_bar): Don't call Draw1Control.
+	(x_scroll_bar_handle_click): Change type of second argument from
+	int to ControlPartCode.
+	(check_alarm): Remove declaration.
+	(XTread_socket) [!TARGET_API_MAC_CARBON]: Don't call it.
+	(XTread_socket): Use ControlPartCode instead of SInt16.
+
[phone]  Nozomu Ando  <[e-mail]>
+
+	* unexmacosx.c: Include assert.h.
+	(MACOSX_MALLOC_MULT16): New define.
+	[MACOSX_MALLOC_MULT16] (ptr_in_unexec_regions): Determine whether
+	ptr is in unexec regions by checking it is multiple of 16.
+	(unexec_malloc_header_t): New typedef.
+	(unexec_malloc, unexec_realloc, unexec_free): Store and use
+	allocated size information in unexec_malloc_header.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (noinclude): Add #undef.
+
+	* image.c, xfns.c, xmenu.c: Don't include signal.h.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name, Frename_file, Fadd_name_to_file)
+	(Fmake_symbolic_link, Faccess_file, Frecent_auto_save_p):
+	Doc fixes.
+
+	* dired.c (Ffile_name_completion): Make argument name
+	match its use in docstring.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* eval.c (Fdefvaralias): Remove any pre-existing
+	variable-documentation property of the alias.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* xfns.c (start_hourglass): Do nothing when running on a tty.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* fns.c (Fchar_table_range): Fix typos in docstring.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fns.c (Fchar_table_range): Yet Another Int/Lisp_Object Mixup.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* lread.c (Flocate_file_internal): Doc fix.
+
+	* Makefile.in (lisp, shortlisp): Add jka-cmpr-hook.elc.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macselect.c (x_own_selection): Accept Lisp string as result of
+	selection converter function.
+	(x_clear_frame_selections): Don't call x-lost-selection-functions
+	if Emacs is not owner of the selection.
+	(Vmac_services_selection): Put variable and initialization in
+	#ifdef MAC_OSX.
+	(syms_of_macselect) [MAC_OSX]: Set default value of
+	Vmac_services_selection to PRIMARY.
+
+	* macterm.c (toolkit_scroll_bar_interaction): Remove unused variable.
+	(mac_handle_tool_bar_click): Remove unused function and declaration.
+	[USE_TOOLKIT_SCROLL_BARS] (scroll_bar_timer_callback)
+	(install_scroll_bar_timer, set_scroll_bar_timer)
+	(control_part_code_to_scroll_bar_part, construct_scroll_bar_click)
+	(get_control_part_bound, x_scroll_bar_handle_press)
+	(x_scroll_bar_handle_release, x_scroll_bar_handle_drag)
+	(x_set_toolkit_scroll_bar_thumb): New functions and declarations.
+	[USE_TOOLKIT_SCROLL_BARS] (last_scroll_bar_part, scroll_bar_timer)
+	(scroll_bar_timer_event_posted_p): New variables.
+	[USE_TOOLKIT_SCROLL_BARS] (SCROLL_BAR_FIRST_DELAY)
+	(SCROLL_BAR_CONTINUOUS_DELAY): New macros.
+	(x_scroll_bar_create): Set control reference with NewControl.
+	(x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]:
+	Initialize track_top and track_height to nil.
+	(x_scroll_bar_set_handle, x_scroll_bar_note_movement):
+	Put functions in #ifndef USE_TOOLKIT_SCROLL_BARS.
+	(XTset_vertical_scroll_bar): Don't make space between scroll bar
+	and associated window.
+	(XTset_vertical_scroll_bar) [MAC_OSX]: Get scroll bar area width
+	from window config.
+	(XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+	Set track_top and track_height to nil when scroll bar size is changed.
+	Recalculate them if they are nil.
+	(XTread_socket) [MAC_OSX]: Use control kind to determine if the
+	clicked control is a scroll bar.
+	(XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Use toolkit scroll bar
+	event handler functions.  Don't add modifiers to scroll bar click
+	events.  Call scroll bar release handler when window is deactivated.
+	(mac_initialize): Remove unused code for X toolkit.
+	(syms_of_macterm) [!USE_TOOLKIT_SCROLL_BARS]:
+	Initialize Vx_toolkit_scroll_bars to nil.
+
+	* macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+	New members track_top and track_height.
+
+	* sysselect.h [DARWIN || MAC_OSX]: Temporarily undefine
+	init_process when including sys/select.h.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* eval.c (Fdefvaralias): Doc fix.
+
+	* xmenu.c (Fx_popup_menu, Fx_popup_dialog): Doc fixes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.c (init_buffer_once): Set cursor_in_non_selected_windows
+	default value.
+	(syms_of_buffer): Add default-cursor-in-non-selected-windows.
+	Fix type of cursor-in-non-selected-windows.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* mac.c: #undef init_process so not to conflict with system headers.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Define cursor-in-non-selected-windows.
+
+	* buffer.h (struct buffer): Add cursor_in_non_selected_windows slot.
+
+	* xdisp.c (Vcursor_in_non_selected_windows)
+	(Qcursor_in_non_selected_windows): Vars deleted.
+	(syms_of_xdisp): Don't initialize them.
+	(get_window_cursor_type): Use cursor_in_non_selected_windows
+	buffer slot.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macros.c (executing_kbd_macro_index): Rename from
+	executing_macro_index.  All uses changed.
+	(executing_kbd_macro_iterations): Rename from
+	executing_macro_iterations.  All uses changed.
+	(executing_kbd_macro): Rename from executing_macro.
+	All uses changed.
+	(syms_of_macros): Rename Lisp var executing-macro-index to
+	executing-kbd-macro-index.
+
+	* xdisp.c (move_it_in_display_line_to): Fix last change.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* xmenu.c (Fx_popup_menu): Doc fix.
+
+	* charset.c (syms_of_charset): Delete defsubr for Schars_in_region.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* emacs.c (USAGE3, USAGE4): Keep strings below 2048 bytes.
+
[phone]  Nozomu Ando  <[e-mail]>
+
+	* sysselect.h: Fix typo.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* charset.c (Fchars_in_region): Remove as obsolete.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_in_display_line_to): Stop if we move beyond
+	TO_CHARPOS.  This may happen if last glyphs was an image or stretch
+	glyph.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* dispnew.c (sit_for): Vexecuting_macro -> Vexecuting_kbd_macro.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c [not HAVE_X_TOOLKIT] (xmenu_show):
+	If user cancels the menu, quit unless FOR_CLICK.
+
+	* macros.c (Vexecuting_kbd_macro): Rename from Vexecuting_macro.
+	All uses changed.
+	(syms_of_macros): Define only executing-kbd-macro, not executing-macro.
+	* keyboard.c: Change Vexecuting_macro to Vexecuting_kbd_macro.
+	* macros.h (Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
+	* commands.h (Vexecuting_kbd_macro): Likewise.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* sysdep.c (get_frame_size) [VMS]: Use a fresh i/o channel.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Ffind_file_name_handler): Handle the `operations'
+	property of the file name handler.
+	(Qoperations): New variable.
+	(syms_of_fileio): Initialize and staticpro it.
+
+	* xdisp.c (set_message_1): Delete xassert.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c: Don't include time.h.  Include sysselect.h after systime.h.
+
+	* macfns.c (Fx_server_version): Add BLOCK_INPUT around Gestalt.
+
+	* macgui.h [HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime
+	before/after including Carbon.h if there is a working mktime.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xfaces.c (resolve_face_name): Add arg SIGNAL_P.  Calls changed.
+	Fix cyclic alias check.  If alias loop is detected, signal
+	circular-list error if SIGNAL_P, and return Qdefault if !SIGNAL_P.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* eval.c (do_autoload): Record only autoloads in the autoload
+	property of symbols.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* emacs.c (USAGE1): Add --basic-display and --quick options.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* data.c (syms_of_data) Staticpro Qcyclic_variable_indirection.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fsame_window_p, Fspecial_display_p): Doc fixes.
+	(syms_of_window): Doc fixes.
+
+	* indent.c (Fvertical_motion): Undo previous change.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (char_table_range): New function.
+	(Fchar_table_range): Signal an error if characters in the range
+	have inconsistent values.  Don't check the parent.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fontset_set): Fix previous change.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* indent.c (Fvertical_motion): Bind fontification-functions to nil.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* regex.c (re_search_2, re_match_2_internal): Convert second arg
+	of RE_TRANSLATE to int, to shut up GCC warnings.
+
+	* fileio.c (Fcopy_file): Doc fix.
+	[MSDOS]: Fix call to emacs_open: buffer_file_type not defined and
+	not needed.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* Makefile.in [HAVE_CARBON] (MAC_OBJ): Add macselect.o.
+	(SOME_MACHINE_OBJECTS): Likewise.
+	(mac.o): Depend on ccl.h.
+	(macselect.o): New target.
+
+	* emacs.c (main) [MAC_OS8 || MAC_OSX && HAVE_CARBON]:
+	Call syms_of_macselect.
+
+	* frame.c (Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
+
+	* mac.c [!TARGET_API_MAC_CARBON]: Don't include charset.h or coding.h.
+	(QCLIPBOARD): Remove variable.
+	(syms_of_mac): Don't initialize it.
+	(Fmac_paste_function, Fmac_cut_function, Fx_selection_exists_p):
+	Remove functions.
+	(syms_of_mac): Don't defsubr them.
+	[TARGET_API_MAC_CARBON] (Qmime_charset, QNFD, QNFKD, QNFC, QNFKC)
+	(QHFS_plus_D, QHFS_plus_C): New variables.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Initialize them.
+	[TARGET_API_MAC_CARBON] (get_cfstring_encoding_from_lisp)
+	(cfstring_create_normalized): New functions.
+	[TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Likewise.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Defsubr it.
+
+	* macterm.c (handling_window_update, terminate_flag):
+	Remove variables.
+	(do_window_update, do_ae_quit_application, XTread_socket):
+	Don't use them.
+	(WNE_SLEEP_AT_SUSPEND, WNE_SLEEP_AT_RESUME): Don't define.
+	[USE_CARBON_EVENTS && MAC_OSX] (mac_handle_service_event)
+	(init_service_handler): Move to macselect.c.  Remove declarations.
+	[USE_CARBON_EVENTS && MAC_OSX] (init_service_handler): Add extern.
+	(Qapplication, Qabout): New variables.
+	(syms_of_mac): Initialize them.
+	[USE_CARBON_EVENTS && MAC_OSX] (Qpreferences, Qservices, Qpaste)
+	(Qperform): New variables.
+	(syms_of_mac) [USE_CARBON_EVENTS && MAC_OSX]: Initialize them.
+	(do_get_menus) [TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
+	(do_menu_choice): Unhighlight menu bar also when menu_id is 0.
+	(mac_store_application_menu_event, init_menu_bar): New functions.
+	[USE_CARBON_EVENTS] (mac_handle_command_event)
+	(init_command_handler): New functions.
+	(mac_handle_window_event): Return noErr on window update event.
+	(do_ae_quit_application): Call mac_store_application_menu_event.
+	(mac_initialize) [USE_CARBON_EVENTS]: Call init_command_handler
+	and init_menu_bar.
+
+	* macterm.h (x_clear_frame_selections): Add extern.
+
+	* macselect.c: New file for selection processing on Mac OS.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Fcopy_file): New arg MUSTBENEW.
+	(Frename_file): Pass new arg to Fcopy_file.
+
+	* window.c (window_size_fixed): Variable deleted.
+	(syms_of_window): Initialize window-size-fixed to nil.
+	But don't DEFVAR window_size_fixed.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* m/macppc.h (LD_SWITCH_MACHINE) [LINUX]: Don't define.
+	(START_FILES, LIB_STANDARD) [LINUX && _ARCH_PPC64]: Override to
+	use lib64 instead of lib.
+	(_LP64) [_ARCH_PPC64]: Define if not defined.
+
[phone]  David Hunter  <[e-mail]>  (tiny change)
+
+	* s/ms-w32.h (HAVE_PWD_H): Define.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (copy_sub_char_table): Explicitly copy the default value
+	of the sub-chartable.
+
+	* fontset.c (fontset_set): When a sub-chartable is created,
+	explicitly sets the defalt value.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (Fplist_get): Replace by Fsafe_plist_get.
+	(Fsafe_plist_get): Rename to Fplist_get.
+	(Fsafe_get): Remove, as Fget now uses safe Fplist_get.
+	(defsubr): Remove defsubr for Fsafe_plist_get and Fsafe_get.
+
+	* lisp.h (Fsafe_plist_get, Fsafe_get): Remove EXFUN.
+
+	* xdisp.c (store_mode_line_string, produce_stretch_glyph)
+	(note_mode_line_or_margin_highlight, note_mouse_highlight):
+	Use Fplist_get instead of Fsafe_plist_get.
+
+	* xfaces.c (resolve_face_name): Use Fget instead of Fsafe_get.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* sysdep.c: Remove reference to defunct vms-pwd.h.
+	* dired.c: Likewise.  Also, for pwd.h, use HAVE_PWD_H, not !VMS.
+	* editfns.c, fileio.c, filelock.c, sysdep.c, xrdb.c: Likewise.
+
+	* config.in: Regenerate.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* lisp.h (CHAR_TABLE_DEFAULT_SLOT_ASCII): New macro.
+	(CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL): New macro.
+	(CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC): New macro.
+
+	* alloc.c (make_sub_char_table): Argument changed to initial
+	value of the slots.
+
+	* data.c (Faref): Handle special slots used as default values of
+	ascii, eight-bit-control, eight-bit-control.  Don't ignore a
+	default value set for a group of characters.
+	(Faset): Signal an error if IDXVAL is not a valid character code.
+	Make a sub-chartable with correct initial value.
+
+	* fns.c (Fset_char_table_range): Don't set slots used as default
+	values for ascii, eight-bit-control, eight-bit-graphic.
+	Don't call Faref with charset-id.
+	(Fset_char_table_default): Document how to treat normal character
+	argument.  Handle special slots used as default values of ascii,
+	eight-bit-control, eight-bit-control.  Make a sub chartable if
+	necessary.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* search.c (boyer_moore): Fix previous change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (setup_for_ellipsis): Reset saved_face_id to use default
+	face unless last visible char and first invisible char have the
+	same face.  Also use default face if saved_face_id is undefined.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macgui.h (MacFontStruct): Remove member `fontname'.  Add member
+	`full_name'.
+	[TARGET_API_MAC_CARBON] (MacFontStruct): Use type int for
+	mac_scriptcode member.
+
+	* macterm.c (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): Remove variables.
+	(syms_of_mac): Don't initialize them.
+	(Vmac_charset_info_alist): New variable.
+	(syms_of_mac): Defvar it.
+	(create_text_encoding_info_alist): New function.
+	(decode_mac_font_name, mac_to_x_fontname)
+	(x_font_name_to_mac_font_name, init_font_name_table): Don't hard
+	code the correspondence among XLFD charsets, Mac script codes, and
+	Emacs coding systems.  Use Vmac_charset_info_alist and result of
+	create_text_encoding_info_alist instead.
+	(init_font_name_table) [TARGET_API_MAC_CARBON]: Use Font Manager
+	routines also on Mac OS Classic.
+	(init_font_name_table) [!TARGET_API_MAC_CARBON]:
+	Use add_font_name_table_entry.
+	(mac_do_list_fonts): Regard 0 in XLFD scaleble fields as
+	specified.  Derive unspecified scalable fields from specified one.
+	(x_list_fonts): Consider Valternate_fontname_alist.
+	(kDefaultFontSize): Change value from 9 to 12.
+	(XLoadQueryFont): Get decoded font family, font face, and charset
+	from x_font_name_to_mac_font_name.  Set full name of loaded font.
+	(mac_unload_font): Free `full_name' member.
+	(x_load_font): Don't try XLoadQueryFont if x_list_fonts returns
+	NULL.  Copy full_name member of struct MacFontStruct to that of
+	struct font_info.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (handle_stop): Set saved_face_id to current face if
+	selective_display_ellipsis_p so ellipsis will be shown in same
+	face as preceding text.
+	(setup_for_ellipsis): Don't set saved_face_id here.
+	(next_element_from_display_vector): Default to saved_face_id.
+
+	* fns.c (Fsafe_get): New function.
+	(syms_of_fns): Defsubr it.
+
+	* lisp.h (Fsafe_get): EXFUN it.
+
+	* xfaces.c (resolve_face_name): Use Fsafe_get to avoid redisplay
+	loops in case of bad face property lists.  Limit number of face
+	alias lookups to 10 (in case of face alias loops).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct glyph_row): New member overlay_arrow_bitmap.
+	It replaces the corresponding member from struct window, as a
+	window may now show multiple overlay arrows.
+	Remove member overlay_arrow_p, superseeded by overlay_arrow_bitmap.
+
+	* dispnew.c (row_equal_p, update_window_line, scrolling_window):
+	Compare overlay_arrow_bitmap than overlay_arrow_p members.
+
+	* fringe.c (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
+	rather than from window.
+	(update_window_fringes): Compare overlay_arrow_bitmap rather than
+	overlay_arrow_p members.
+	(Ffringe_bitmaps_at_pos): Return fringe overlay_arrow_bitmap name
+	if not default.
+
+	* window.h (struct window): Remove member overlay_arrow_bitmap.
+
+	* window.c (make_window): Don't initialize overlay_arrow_bitmap.
+
+	* xdisp.c (overlay_arrow_string_or_property): Remove PBITMAP arg.
+	Calls changed.  Don't check for overlay-arrow-bitmap property here.
+	(overlay_arrow_at_row): Remove PBITMAP arg.  Instead, if left
+	fringe is present, return Lisp integer for bitmap (or -1 for default).
+	Fix value of overlay-arrow-bitmap property to be a symbol, use
+	lookup_fringe_bitmap to parse it.
+	(display_line): Change call to overlay_arrow_at_row.  Store integer
+	return value as overlay bitmap in row rather than window.
+	Only show overlay arrow if row displays text, or if no other overlay
+	arrow is seen in window (if overlay marker is at point-max).
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* xfaces.c (realize_x_face) [!HAVE_WINDOW_SYSTEM]: Return NULL.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* lread.c (Vloads_in_progress): Static.
+	* fns.c (Vloads_in_progress): Remove extern.
+	(load_in_progress): Add extern.
+	(Frequire): Use load_in_progress instead of Vloads_in_progress.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* xmenu.c (Fx_popup_menu): Initialize error_name to NULL.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (XTread_socket): Don't beep on keyboard input even if
+	no frame is visible.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* term.c (struct keys): Add support for shifted keys.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (with_echo_area_buffer): Delete WHICH < 0 case.
+	(set_message): Call with_echo_area_buffer with WHICH = 0.
+	(set_message_1): Erase the echo area buffer first thing.
+	(echo_area_display): Don't clear echo_message_buffer.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* Makefile.in (mac.o): Depend on charset.h and coding.h.
+
+	* mac.c: Include charset.h and coding.h.
+	[TARGET_API_MAC_CARBON] (Qutf_8): Remove extern.
+	[TARGET_API_MAC_CARBON] (cfstring_create_with_string): New function.
+	[TARGET_API_MAC_CARBON] (Fmac_get_preference): Use it.
+
+	* macfns.c [TARGET_API_MAC_CARBON] (Fx_file_dialog): Likewise.
+
+	* image.c [MAC_OSX] (image_load_quartz2d): Likewise.
+
+	* macterm.c (x_autoselect_window_p): Remove variable.
+	(last_window): New variable.
+	(XTreassert_line_highlight, x_change_line_highlight):
+	Remove declarations.
+	(mac_focus_changed, x_detect_focus_change): New functions and
+	declarations.
+	(XTextExtents16, front_emacs_window): Remove function.
+	(mac_focus_frame): New function.
+	(XTmouse_position, do_menu_choice, do_zoom_window, XTread_socket)
+	(mac_check_for_quit_char): Use it instead of front_emacs_window.
+	(x_scroll_bar_report_motion): Obtain window from control owner.
+	(x_make_frame_invisible): Set window manager size hint.
+	(do_mouse_moved): Remove function.
+	(XTread_socket): Move its contents here.  Generate select-window
+	event on mouse movement if needed.  Use x_detect_focus_change on
+	activate/deactivate events.  Don't deiconify frame or invalidate
+	window rectangle when dnd items are dropped.
+	Don't activate/deactivate root control.
+	(frame_highlight, frame_unhighlight): Activate/deactivate root
+	control here.
+	(syms_of_macterm): Delete DEFVAR_BOOL for x_autoselect_window_p.
+
+	* macterm.h (cfstring_create_with_string) [TARGET_API_MAC_CARBON]:
+	New extern.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* Makefile.in: Define new macro TOOLTIP_SUPPORT.
+	(lisp): Use it.
+	(SOME_MACHINE_LISP): Add tooltip.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c [!TARGET_API_MAC_CARBON]: Include MacLocales.h.
+	Don't include TextEncodingConverter.h.
+	(mac_system_script_code, Vmac_system_locale): New variables.
+	(syms_of_mac): Defvar them.
+	(mac_get_system_locale): New function.
+
+	* macfns.c (x_set_name, x_set_title) [!TARGET_API_MAC_CARBON]:
+	Use ENCODE_SYSTEM to encode title bar string.
+	(x_create_tip_frame): Apply 2005-03-18 change for xfns.c.
+	(Fx_file_dialog) [TARGET_API_MAC_CARBON && !MAC_OSX]:
+	Use CFStringGetSystemEncoding to get system default string encoding.
+
+	* macterm.c [!TARGET_API_MAC_CARBON]: Don't include
+	TextEncodingConverter.h.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (syms_of_macterm): Remove redundant definition of
+	mac-pass-control-to-system.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Fset_window_configuration): Be careful when you choose
+	among several possible points for the new_current_buffer.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c (poll_for_input) [SYNC_INPUT]: Don't call
+	poll_for_input_1.  Set interrupt_input_pending to 1 instead.
+	(Qlanguage_change) [MAC_OS]: New variable.
+	(syms_of_keyboard) [MAC_OS]: Intern and staticpro it.
+	(kbd_buffer_get_event) [MAC_OS]: Make event for LANGUAGE_CHANGE_EVENT.
+
+	* macterm.c (mac_keyboard_text_encoding)
+	(current_mac_keyboard_text_encoding): Remove variables.
+	(XTread_socket): Store language-change event if keyboard script	change
+	is detected.  Don't convert input to `mac_keyboard_text_encoding'.
+	(syms_of_macterm): Delete DEFVAR_INT for mac-keyboard-text-encoding.
+
+	* termhooks.h (enum event_kind) [MAC_OS]: Add LANGUAGE_CHANGE_EVENT.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* emacs.c (standard_args): Rename --bare-bones to --quick.
+	Add -D aka --basic-display.
+
+	* buffer.c (Fmake_indirect_buffer): Clear out some local variables.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (where_is_internal): Convert a string used as event type
+	into "(any string)".
+
+	* lread.c (Vloads_in_progress): Not static.
+	* fns.c (Vloads_in_progress): Add extern.
+	(Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* dispnew.c (mirror_line_dance): Avoid crash if W2 is null.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is
+	within the accessible part of the buffer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lread.c (readevalloop): Add args START and END as region in
+	current buffer to read.  Callers changed.
+	When specified, narrow to this region only when reading,
+	not during eval.  Track next point to read from during eval.
+	Also restore point to "real" buffer position before eval.
+	(Feval_region): Don't save excursion and restriction here, and
+	don't narrow to region.  Just pass region to readevalloop.
+	Note: Point is now preserved even when PRINTFLAG is nil.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp): Init overlay-arrow-string to "=>".
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* emacs.c (standard_args): Add -Q, --bare-bones, -bare-bones.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (cfdate_to_lisp): Add `const' for variable `epoch_gdate'.
+	(Fmac_get_preference): Doc fix.
+
+	* macfns.c (Fx_create_frame, x_create_tip_frame):
+	Add "fontset-mac" to fallback font/fontsets.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (Fgarbage_collect): Call CHECK_CONS_LIST before and after gc.
+
+	* eval.c (Ffuncall): Always call CHECK_CONS_LIST on entry.
+	Call it again after autoload.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* alloc.c (allocate_string_data): Call BLOCK_INPUT before calling
+	mallopt.
+
+	* ralloc.c (r_alloc_init): Ditto.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* lisp.h (Vascii_upcase_table, Vascii_canon_table)
+	(Vascii_eqv_table): Extern them.
+
+	* casetab.c (set_case_table): If standard is nonzero, setup
+	Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
+
+	* search.c (looking_at_1): Use current_buffer->case_canon_table,
+	not DOWNCASE_TABLE.
+	(string_match_1): Likewise.
+	(fast_c_string_match_ignore_case): Use Vascii_canon_table, not
+	Vascii_downcase_table.
+	(fast_string_match_ignore_case): Likewise.
+	(search_buffer): Fix checking of boyer-moore usability.
+	(boyer_moore): Calculate translate_prev_byte1/2/3 in advance.
+	No need of tranlating characters in PAT.  Fix calculation of
+	simple_translate.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c [HAVE_XAW3D]: Include ThreeD.h for XtNbeNiceToColormap.
+	(x_create_toolkit_scroll_bar): Test XtNbeNiceToColormap before using it.
+	Use XtNtopShadowPixel and XtNbottomShadowPixel.
+	(x_set_toolkit_scroll_bar_thumb): Remove ugly old hack that didn't
+	really work and that breaks with some versions of Xaw3d.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (syms_of_coding): Fix previous change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (search_embedded_absfilename): Fix last change.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (syms_of_coding): Suggest to use set-coding-category in
+	the docstring of coding-category-list.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (Qmouse_fixup_help_message): New var.
+	(syms_of_keyboard): Intern and staticpro it.
+	(show_help_echo): Apply mouse-fixup-help-message to help string.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (display_line): Allow multiple overlay arrows in window.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name): Use IS_DEVICE_SEP.
+	(file_name_absolute_p): New fun, extracted from Ffile_name_absolute_p.
+	(Ffile_name_absolute_p): Use it.
+	(search_embedded_absfilename): New fun, extracted from
+	Fsubstitute_in_file_name.  Use file_name_absolute_p.
+	Free the pw data after use.
+	(Fsubstitute_in_file_name): Use it.
+	After cutting a prefix, re-check file-name-handler.
+
[phone]  Lennart Borgman  <[e-mail]>
+
+	* w32term.h (x_output): Add focus_state.
+
+	* w32term.c (x_focus_changed, w32_detect_focus_change): New functions.
+	(w32_read_socket) [WM_SETFOCUS]: Call w32_detect_focus_change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (Fminibuffer_complete_and_exit, Fself_insert_and_exit):
+	Use Fexit_minibuffer.
+	(Fexit_minibuffer): Mark it as no-return, deactivate the mark.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* dired.c (Ffile_attributes): Add a missing gcpro.
+
+	* alloc.c (make_number): The arg can be bigger than `int'.
+	* lisp.h (make_number): Make prototype more precise.
+
+	* process.c, dired.c (Vfile_name_coding_system)
+	(Vdefault_file_name_coding_system):
+	* callproc.c (Vdoc_file_name, Vfile_name_coding_system)
+	(Vdefault_file_name_coding_system): Remove unused declarations.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (create_and_show_popup_menu): Just remove menu and return
+	if it failed to pop up (Gnome "show pointer on ctrl" option makes
+	menus fail to pop up).
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Also use `\ ' & `\-' for latin-9.
+	Just prepend a backslash without replacing the NBSP by an SPC.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xfaces.c (lookup_derived_face): Add arg SIGNAL_P.
+	* dispextern.h (lookup_derived_face): Fix prototype.
+	* msdos.c (XMenuActivate): Fix call to lookup_derived_face.
+
+	* xdisp.c (handle_single_display_spec): Derive left-fringe and
+	right-fringe face from fringe face.
+
+	* fringe.c (draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
+	Derive face from fringe face.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xrdb.c (x_load_resources): Undo previous change (2005-03-18).
+
[phone]  David Kastrup  <[e-mail]>
+
+	* textprop.c (Fnext_char_property_change)
+	(Fprevious_char_property_change): Allow marker as limit.
+	(Fnext_single_char_property_change)
+	(Fprevious_single_char_property_change): Check that limit is a
+	number in strings.
+	(Fnext_single_char_property_change): Coerce position to integer.
+	(Fprevious_single_char_property_change): Same here.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Define if undefined.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* frame.c (Fignore_event): Remove.
+	(syms_of_frame): Don't defsubr it.
+
+	* keyboard.c (keys_of_keyboard): Just use `ignore' instead of the
+	redundant `ignore-event'.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* unexec.c (write_segment, unexec): Move these functions to avoid
+	forward references (which cause errors with "gcc -gcoff").
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (x_create_tip_frame): Remove setting of Vx_resource_name so
+	that it doesn't become "tooltip".  The specbind is enough.
+
+	* xrdb.c (x_load_resources): Use different char *helv when I18N
+	is present.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (syms_of_coding): Docstring of coding-category-list fixed.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfaces.c (x_update_menu_appearance) [HAVE_X_I18N]:
+	Use xic_create_fontsetname even for non-Motif menus.
+	Don't forget to free the fontsetname.
+
+	* xfns.c (xic_create_fontsetname): Add a final catch-all font pattern.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* dispnew.c (mirror_line_dance): Set W2 according to FRAME_FROM.
+
+	* fileio.c (Fcopy_file, Frename_file, Fadd_name_to_file)
+	(Fmake_symbolic_link): Use G to read the new file name.
+
+	* callint.c (Finteractive): Document G option.
+	(Fcall_interactively): Implement G option.
+
+	* buffer.c (buffer_lisp_local_variables): New function,
+	broken out from Fbuffer_local_variables.
+	(clone_per_buffer_values): Use buffer_lisp_local_variables.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfns.c (xic_create_fontsetname): Add `motif' argument.
+	Always return a freshly allocated string.
+	(xic_create_xfontset): Adjust call.
+
+	* xfaces.c (x_update_menu_appearance) [USE_MOTIF]:
+	Use xic_create_fontsetname to create a fontset so utf-8 locales work.
+	(dump_realized_face): Fix warning.
+
+	* emacs.c (Fkill_emacs): YAILOM.
+
+	* frame.c (Fignore_event): Fix ancient obscure C-u handling bug.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (HASHKEY_TERMINAL): Remove.
+	(HASHKEY_MAX_NID): New macro.
+	(xrm_q_get_resource_1): Rename from xrm_q_get_resource.  Add extra
+	argument.
+	(xrm_q_get_resource): Call xrm_q_get_resource_1 with extra argument.
+	(xrm_create_database, xrm_q_put_resource)
+	(xrm_merge_string_database, xrm_q_get_resource_1)
+	(xrm_q_get_resource): Change resource database representation so
+	that it may not use multiple hash tables for a single database.
+	[TARGET_API_MAC_CARBON] (xrm_cfproperty_list_to_value): YAILOM.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xmenu.c (ENCODE_MENU_STRING) [HAVE_X_I18N]: Use ENCODE_SYSTEM.
+
+	* coding.h (ENCODE_SYSTEM, DECODE_SYSTEM) [!WINDOWSNT]: Use the
+	locale-coding-system, as was already done for WINDOWSNT.
+
+	* keyboard.c (read_char): Only do the 7-bit-meta -> 27-bit-meta
+	translation for chars in the 0-255 range.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* floatfns.c (Ffloor): Doc fix.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c: Include macterm.h instead of directly including Carbon.h.
+	[TARGET_API_MAC_CARBON] (Qstring, Qnumber, Qboolean, Qdate, Qdata)
+	(Qarray, Qdictionary): New variables.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Initialize them.
+	[TARGET_API_MAC_CARBON] (Qutf_8): Add extern.
+	[TARGET_API_MAC_CARBON] (DECODE_UTF_8): New macro.
+	[TARGET_API_MAC_CARBON] (struct cfdict_context): New struct used
+	in callback for CFDictionaryApplyFunction.
+	[TARGET_API_MAC_CARBON] (cfdata_to_lisp, cfstring_to_lisp)
+	(cfnumber_to_lisp, cfdate_to_lisp, cfboolean_to_lisp)
+	(cfobject_desc_to_lisp, cfdictionary_add_to_list)
+	(cfdictionary_puthash, cfproperty_list_to_lisp): New functions.
+	[TARGET_API_MAC_CARBON] (Fmac_get_preference): New function.
+	(syms_of_mac) [TARGET_API_MAC_CARBON]: Defsubr it.
+	(P, LOOSE_BINDING, SINGLE_COMPONENT, HASHKEY_TERMINAL): New macro.
+	(skip_white_space, parse_comment, parse_include_file)
+	(parse_binding, parse_component, parse_resource_name, parse_value)
+	(parse_resource_line, xrm_create_database, xrm_q_put_resource)
+	(xrm_merge_string_database, xrm_q_get_resource, xrm_get_resource)
+	(xrm_cfproperty_list_to_value, xrm_get_preference_database):
+	New functions.
+
+	* macfns.c (mac_get_rdb_resource): Remove function.
+	(x_get_string_resource): Use xrm_get_resource.
+
+	* macgui.h (XrmDatabase): Typedef to Lisp_Object.
+
+	* macterm.c (x_list_fonts): FONT-LIST-CACHE is now cadr part of
+	name_list_element.
+	(mac_make_rdb): Create resource database from preferences and
+	argument string.
+	(mac_term_init): Save resource database to cddr part of
+	name_list_element.
+
+	* macterm.h (xrm_merge_string_database, xrm_get_resource)
+	(xrm_get_preference_database): Add externs.
+	[TARGET_API_MAC_CARBON] (cfdata_to_lisp, cfstring_to_lisp)
+	(cfnumber_to_lisp, cfdate_to_lisp, cfboolean_to_lisp)
+	(cfobject_desc_to_lisp, cfproperty_list_to_lisp): Likewise.
+
+	* process.c (init_process): Change `#ifdef DARWIN' to `#if
+	defined (DARWIN) || defined (MAC_OSX)'
+
+	* s/darwin.h (DARWIN): Don't define.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (Qhyper, Qsuper, Qmeta, Qalt, Qctrl, Qcontrol, Qshift):
+	Remove unused variables.
+	(syms_of_macfns): Don't initialize them.  Likewise for
+	Qface_set_after_frame_default.  Defvar and initialize
+	Vx_window_horizontal_drag_shape.
+	(x_set_mouse_color): Change mouse pointer shape.
+	(mac_window) [!MAC_OSX]: Create root control.
+	(Fx_create_frame): Remove initializations of mouse pointer shapes.
+	(hourglass_started): New function (from xfns.c).
+	(start_hourglass, cancel_hourglass): Put function body in #ifdef
+	MAC_OSX.
+	(show_hourglass) [TARGET_API_MAC_CARBON]: Create progress
+	indicator for each non-tooltip frame if needed, and show it.
+	(hide_hourglass) [TARGET_API_MAC_CARBON]: Hide progress indicators.
+
+	* macgui.h [!TARGET_API_MAC_CARBON]: Include Appearance.h and
+	Controls.h.  Use ThemeCursor instead of CursHandle.
+
+	* macterm.c (activate_scroll_bars, deactivate_scroll_bars):
+	Remove functions and declarations.
+	(mac_set_colors): Take argument for saving background color.
+	All callers changed.
+	(XDrawLine, XClearArea, mac_draw_bitmap, XFillRectangle)
+	(mac_draw_rectangle, mac_draw_string_common): Save and Restore
+	background color.
+	(x_update_end, mac_do_track_drag): Don't reset background color.
+	(mac_define_frame_cursor) [!TARGET_API_MAC_CARBON]:
+	Use SetThemeCursor.
+	(x_set_window_size) [TARGET_API_MAC_CARBON]: Move progress
+	indicator control to the upper-right corner of the window.
+	(arrow_cursor) [!TARGET_API_MAC_CARBON]: Remove variable.
+	(do_init_managers) [!TARGET_API_MAC_CARBON]: Don't initialize it.
+	(do_window_update): Update controls after updating content area.
+	(mac_handle_window_event): Remove unused extern.
+	(XTread_socket): Check both control handle and control part code
+	to determine whether a scroll bar is clicked.  Activate/deactivate
+	root control instead of contained scroll bar controls.
+	(make_mac_terminal_frame): Use ThemeCursor constants.
+
+	* macterm.h (struct mac_output) [TARGET_API_MAC_CARBON]:
+	New member hourglass_control.
+	(HOURGLASS_WIDTH, HOURGLASS_HEIGHT): New defines.
+	(activate_scroll_bars, deactivate_scroll_bars): Remove declarations.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (keycode_to_xkeysym_table): Change mapping so that it
+	coincides with that in Apple X11 except `clear', `enter' on
+	laptops, and fn + `enter' on laptops.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xmenu.c (ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
+	(list_of_panes, list_of_items, Fx_popup_menu): Use XCAR/XCDR.
+	(digest_single_submenu, xmenu_show): Use ENCODE_MENU_STRING.
+
+	* xfns.c (xic_defaut_fontset): New constant.
+	(xic_create_fontsetname): New function.
+	Extracted from create_frame_xic.  Try to generate a slightly
+	better fontset.
+	(xic_create_xfontset): Use it.
+	(create_frame_xic): Simplify.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Fmake_symbolic_link): Fix last change.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Frename_file, Fadd_name_to_file)
+	(Fmake_symbolic_link): If NEWNAME or LINKNAME is a directory,
+	expand the basename of FILE relative to it.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents): Call Fcheck_coding_system
+	before calling setup_coding_system so that autoloading of a coding
+	system work.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (hourglass_started): New function.
+
+	* dispextern.h: Declare hourglass_started.
+
+	* keyboard.c (Fexecute_extended_command): Restart hourglass
+	after call to Fcompleting_read if already started.
+
+	* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
+	GTK main loop is entered in xterm.c, thus doing the redraw.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (pos_visible_p): Fix X value in last line of buffer.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* frame.c (x_set_font): Call set_default_ascii_font if an
+	available font is found.
+
+	* fontset.c (set_default_ascii_font): New function.
+	(syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset) here.
+
+	* fontset.h (set_default_ascii_font): Extern it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (CLEAR_IMAGE_CACHE_COUNT): New const.
+	(clear_image_cache_count): New var.
+	(redisplay_internal): Don't clear face and image caches in the
+	middle of redisplay; do it afterwards.
+
+	* blockinput.h (TOTALLY_UNBLOCK_INPUT): Avoid dangling else.
+
+	* xdisp.c (notice_overwritten_cursor): Check that phys_cursor.vpos
+	is valid.  If not, clear phys_cursor_on_p and return.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* blockinput.h (UNBLOCK_INPUT_TO): Always call UNBLOCK_INPUT.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
+
+	* eval.c (unwind_to_catch): Use UNBLOCK_INPUT_TO.
+	(Feval, Ffuncall): Use CHECK_CONS_LIST.
+
+	* lisp.h (CHECK_CONS_LIST): New macro (two definitions).
+
+	* blockinput.h (UNBLOCK_INPUT_TO): New macro.
+	(TOTALLY_UNBLOCK_INPUT): Handle a pending signal if any.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* emacs.c (USAGE1): Replace Info node name "command arguments"
+	with "emacs invocation".
+	(USAGE3): Fix usage of `--color=MODE' which actually doesn't
+	allow arguments `--color' and `MODE' to be separated by space.
+	Add --no-blinking-cursor, -nbc.
+	(standard_args): Add -nbc, --no-blinking-cursor.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* s/vms.h: Define NO_HYPHENS_IN_FILENAMES.
+	* s/vms4-4.h, s/vms5-5.h: Undefine NO_HYPHENS_IN_FILENAMES.
+	* fileio.c (Fexpand_file_name) [VMS]:
+	Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.
+	* doc.c (munge_doc_file_name) [VMS]: Likewise.
+	(Fsnarf_documentation): Call munge_doc_file_name.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* s/vms.h (FILE_SYSTEM_CASE): New macro.
+	* fileio.c (Fexpand_file_name) [VMS]: Don't upcase the name
+	"manually"; this is now handled generally via FILE_SYSTEM_CASE.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* emacs.c (main): Change `#ifdef HAVE_CARBON' to `#if
+	defined (MAC_OSX) && defined (HAVE_CARBON)'.
+
+	* image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
+
+	* mac.c [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+	[!MAC_OSX] (select) [TARGET_API_MAC_CARBON]: Use ReceiveNextEvent.
+	(posix_pathname_to_fsspec, fsspec_to_posix_pathname): New functions.
+	(mac_clear_font_name_table): Move extern to macterm.h.
+
+	* macfns.c (install_window_handler): Move extern to macterm.h.
+	(Fx_file_dialog): Check STRINGP (default_filename) to see it is
+	valid.  Don't check !NILP (dir) because it is already checked with
+	CHECK_STRING.
+	(Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
+	specifying the default location and obtaining the selected filename.
+
+	* macgui.h [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+
+	* macmenu.c [TARGET_API_MAC_CARBON]: Don't include headers that
+	are included via Carbon.h.
+
+	* macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]:
+	Define USE_CARBON_EVENTS to 1.
+	(qd) [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare.
+	(x_free_frame_resources): Call remove_window_handler for
+	non-tooltip windows.
+	[TARGET_API_MAC_CARBON]: Don't include headers that are included
+	via Carbon.h.
+	[TARGET_API_MAC_CARBON] (mac_do_track_dragUPP)
+	(mac_do_receive_dragUPP): New variables.
+	(mac_handle_service_event, init_service_handler): Put declarations
+	and definitions in #ifdef MAC_OSX.
+	(install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for
+	drag-and-drop handler functions and register them.
+	(remove_window_handler): New function.
+	(do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]:
+	Use fsspec_to_posix_pathname.
+	(main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8.
+	(XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
+	[MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]:
+	Set default cursors.
+	(mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call
+	init_service_handler or init_quit_char_handler.
+	(mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
+
+	* macterm.h (install_window_handler, remove_window_handler)
+	(posix_pathname_to_fsspec, fsspec_to_posix_pathname)
+	(mac_clear_font_name_table): New externs.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* fileio.c (FILE_SYSTEM_CASE): Define macro if not already defined.
+	(Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
+	(Fexpand_file_name): Likewise.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* emacs.c (Fkill_emacs): Use EXIT_SUCCESS;
+	no longer special-case VMS.  Add bogus return value.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (XASSERTS): Define to 0 if not already defined.
+	(xassert) [!XASSERTS]: Define dummy version.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_window): YABX (yet another bogus xassert).
+	Reported by David Kastrup.
+
[phone]  Ehud Karni  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Fix control and escape
+	glyph from display vector.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (fast_find_position): Rename END to BEG.
+	(syms_of_xdisp) <menu-bar-update-hook>: Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
+	gtk_window_resize and x_wm_set_size_hint.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (OVERLAY_STRING_CHUNK_SIZE): Increase from 3 to 16.
+
+	* xdisp.c (init_from_display_pos): Don't read past end of
+	it->overlay_strings array.
+
[phone]  Stephan Stahl  <[e-mail]>  (tiny change)
+
+	* buffer.c (syms_of_buffer): Fix typo.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* buffer.c (Foverlay_buffer): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* minibuf.c (Ftry_completion, Fall_completions): Allow both string
+	and symbol keys in alists and hash tables.
+
+	* xdisp.c (fast_find_position): Fix search for start of overlay.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based): When scrolling backwards,
+	handle partial visible line at end of window even when we hit PT.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.h: Declare Fcurrent_active_maps, used in doc.c.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_vertically_backward): Eliminate two xasserts.
+	I think those asserts are bogus if buffer contains invisible text
+	or images.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* gtkutil.c (xg_create_frame_widgets): UNBLOCK_INPUT on error.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (pos_visible_p): Be sure to move to the specified
+	position.  Always get the full ascent / descent of the
+	corresponding row, to return reliable rtop and rbot values.
+	(back_to_previous_visible_line_start): Fix 2005-01-18 change.
+	Must look one character back, as back_to_previous_line_start
+	returns position after the newline.
+	(move_it_vertically_backward): Fix heuristic for when to move further
+	back in case line_height * 2/3 is larger than window height.
+	(cursor_row_fully_visible_p): Rename make_cursor_line_fully_visible_p
+	as it does not do anything anymore.  Add arg current_matrix_p to
+	use current matrix rather than desired matrix when set.
+	(try_cursor_movement): Don't scroll to make cursor row fully
+	visible if cursor didn't move.  This avoids unexpected recentering
+	in case of blinking cursor or accepting process output.
+	Use current matrix to check cursor row visibility.
+	(redisplay_window): Fix whether to recenter or move to top in case
+	cursor line is taller than window height.
+	(find_first_unchanged_at_end_row): Stop search if we reach a row
+	which not enabled (instead of abort).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xfaces.c (Finternal_set_lisp_face_attribute): Allow :color property
+	to be nil in a :box attribute value list; customize prints that
+	as lisp value when no box color is specified.
+
+	* .gdbinit (pitx, pit): Pretty print display iterator.
+	(prowx, prow): Pretty print glyph row.
+	(pcursorx, pcursor): Pretty print a window cursor.
+	(pwinx, pwin): Pretty print struct window.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (BLOCK_BYTES): Harmless typo.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xfns.c (hack_wm_protocols): Use correct type for last parameter
+	of XGetWindowProperty to avoid aliasing issues.
+	(Fx_window_property): Likewise.
+
+	* xselect.c (Fx_disown_selection_internal): Use union of struct
+	input_event and struct selection_input_event to avoid aliasing issues.
+
+	* xterm.c (handle_one_xevent): Use union of struct input_event and
+	struct selection_input_event to avoid aliasing issues.
+	(SET_SAVED_MENU_EVENT): Adapt reference to inev.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (enum it_method): New enum.
+	(GET_FROM_*): Its members.
+	(struct it): Change member method from function pointer to enum.
+
+	* xdisp.c (check_it, init_from_display_pos, handle_stop)
+	(setup_for_ellipsis, handle_single_display_spec)
+	(handle_composition_prop, next_overlay_string)
+	(get_overlay_strings, reseat_1, reseat_to_string)
+	(next_element_from_ellipsis, BUFFER_POS_REACHED_P)
+	(in_display_vector_p, display_line, get_next_display_element):
+	Change it->method from function pointer to enum.
+	(get_next_element): New array to map it->method to function.
+	(get_next_display_element): Use it.
+	(set_iterator_to_next): Use switch instead of if/else chain.
+
[phone]  Benjamin Riefenstahl  <[e-mail]>
+
+	* w32select.c: Summary: Thorough rework to implement Unicode
+	clipboard operations and delayed rendering.
+
+	Drop last_clipboard_text and related code, keep track of
+	ownership via clipboard_owner instead.  Drop old #if0 sections.
+
+	(DEFAULT_LCID, ANSICP, OEMCP, QUNICODE, QANSICP, QOEMCP)
+	(clipboard_owner, modifying_clipboard, cfg_coding_system)
+	(cfg_codepage, cfg_lcid, cfg_clipboard_type, current_text)
+	(current_coding_system, current_requires_encoding)
+	(current_num_nls, current_clipboard_type, current_lcid):
+	New static variables.
+
+	(convert_to_handle_as_ascii, convert_to_handle_as_coded)
+	(render, render_all, run_protected, lisp_error_handler)
+	(owner_callback, create_owner, setup_config)
+	(enum_locale_callback, cp_from_locale, coding_from_cp):
+	New local functions.
+
+	(term_w32select, globals_of_w32select): New global functions.
+
+	(Fw32_set_clipboard_data): Ignore parameter FRAME, use
+	clipboard_owner instead.  Use delayed rendering and provide
+	all text formats.  Provide CF_LOCALE if necessary.
+
+	(Fw32_get_clipboard_data): Handle CF_UNICODETEXT and
+	CF_LOCALE.  Fall back to CF_TEXT, if CF_UNICODETEXT is not
+	available.  Force DOS line-ends for decoding.
+
+	(Fx_selection_exists_p): Handle CF_UNICODETEXT.
+
+	(syms_of_w32select): Init and register new variables.
+
+	* w32.h: Add prototypes for globals_of_w32select and
+	term_w32select.  Make the neighboring K&R declarations into
+	prototypes, too.
+
+	* emacs.c: Include w32.h to get function prototypes.
+	(main): Call globals_of_w32select.
+
+	* w32.c (term_ntproc): Call term_w32select.
+
+	* s/ms-w32.h: Guard MSC-specific #pragmas with an #ifdef.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (BUFFER_POS_REACHED_P): Return true if pos reached and
+	at end of display vector.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Fix escape-glyph criterion
+	for mode and header lines.
+
+	* lread.c (syms_of_lread) <user-init-file>: Doc fix.
+
+	* keymap.h (describe_map_tree): Change decl.
+
+	* keyboard.c (command_loop_1): Always use safe_run_hooks
+	to run Qdeferred_action_function.
+
+	* keymap.c (describe_map_tree): New arg MENTION_SHADOW.  Calls changed.
+	(describe_map, describe_vector): Likewise.  When it's 1,
+	don't omit shadowed bindings, instead mark them as shadowed.
+
+	* doc.c (Fsubstitute_command_keys): Compute list of shadowing maps
+	for describe_map_tree.  Pass 1 for MENTION_SHADOW.
+
+	* data.c (Fsetq_default): Allow no arg case.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (encode_coding_string): Always return a unibyte string.
+	If NOCOPY is nonzero and there's no need of encoding, make STR
+	unibyte directly.
+
+	* xselect.c (lisp_data_to_selection_data): If OBJ is a non-ASCII
+	multibyte string, signal an error instead of aborting.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* keyboard.c: If HAVE_FCNTL_H include fcntl.h.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (expose_window): Don't fix overlaps for mode lines.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (try_window_id): Set first_unchanged_at_end_row to NULL
+	if it moves outside window or it doesn't display text.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* undo.c (Fprimitive_undo): Check that undo function does not
+	switch buffer.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xselect.c (selection_data_to_lisp_data): For the special case
+	type == XA_ATOM, data contains array of int, not array of Atom.
+	(x_property_data_to_lisp, selection_data_to_lisp_data):
+	Comment update: data must be array of int for format == 32.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* undo.c (Fprimitive_undo): Check veracity of delta,start,end.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (Fx_change_window_property): Use long array when format is 32.
+	(Fx_window_property): If format is 32 and long is bigger than 32 bits,
+	convert long array returned from XGetWindowProperty to an int array.
+	(x_set_tool_bar_lines): Check that width and height is greater than
+	zero before clearing area.
+
+	* xselect.c (x_reply_selection_request): Pass long array to
+	XChangeProperty so that 64 bit longs are handeled correctly.
+	(x_get_window_property): If format is 32 and long is bigger than 32
+	bits convert data from XGetWindowProperty from long array to int array.
+	(lisp_data_to_selection_data): When the input is a vector and the
+	format is 32, allocate a long array even if long is bigger than 32 bits.
+	(x_fill_property_data): Use char, short and long as the man page
+	for XChangeProperty specifies.  This way the data returned is OK for
+	both 32 and 64 bit machines.
+	(x_handle_dnd_message): Calculate size correctly even for 64 bit
+	machines.
+	(Fx_send_client_event): Undo change from 2005-02-05,
+	x_fill_property_data now handles that case.
+
+	* xfns.c (Fx_backspace_delete_keys_p): Add comment about the
+	reason for the approach in the code.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* undo.c (Fprimitive_undo): Record max one dummmy apply element.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (Frun_hook_with_args)
+	(Frun_hook_with_args_until_success)
+	(Frun_hook_with_args_until_failure): Doc fixes.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* sysdep.c (sys_subshell): Properly terminate execlp argument list.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xselect.c (Fx_send_client_event, x_handle_dnd_message): Handle
+	the longs in a XClientMessageEvent correctly when long is 64 bits.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xfaces.c (face_color_supported_p): Use HAVE_WINDOW_SYSTEM
+	instead of HAVE_X_WINDOWS, for non-X windowed sessions.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (menubar_selection_callback): Force out GTK buffered
+	events so the menu event comes after them.  This is to prevent sit-for
+	from exiting on buffered events directly after a menu selection,
+	lisp code for Help => About Emacs uses sit-for.
+
+	* gtkutil.c (create_menus): Connect selection-done event instead of
+	the deactivate event to deactivate_cb.  This will make the last
+	leave event come before the call to deactivate_cb, so the leave
+	event does not make sit-for exit after a menu selection.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (build_frame_matrix_from_leaf_window)
+	 [!GLYPH_DEBUG]: Fix xassert.
+
+	* xfaces.c (x_free_gc) [!GLYPH_DEBUG]: Fix xassert.
+
+	* xfns.c (unwind_create_frame) [!GLYPH_DEBUG]: Fix xassert.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c: Use MAC_OS_X_VERSION_MAX_ALLOWED to conditionalize by
+	the compiling OS version.
+
+	* macfns.c (x_create_tip_frame): Likewise.
+
+	* macterm.c (mac_draw_string_common, x_make_frame_visible): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (x_error_quitter): On GCC 3 and up, specify noinline.
+
+	* xdisp.c (echo_area_display): Clear echo_message_buffer.
+
+	* buffer.c (Fbury_buffer): Doc fix.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macfns.c (unwind_create_frame): Fix compile error due to
+	xassert being uncondition, but predicate is.
+	* dispnew.c (update_window): Fix compile error due to
+	xassert being uncondition, but predicate is.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* dispextern.h (xassert): Enable unconditionally.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* undo.c (Fprimitive_undo): Fix dummy apply undo entry.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* casefiddle.c (casify_object): Enable changing characters of
+	different byte length.
+	(casify_region): Fix loop condition, args to replace_range_2, and
+	update opoint_byte.
+
+	* insdel.c (replace_range_2): Fix bugs in adjusting markers and point.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (back_to_previous_visible_line_start): Reset iterator
+	stack before calling handle_display_prop.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* undo.c (Qapply): New lisp var.
+	(syms_of_undo): Intern and staticpro it.
+	(Fprimitive_undo): Support formats (apply FUNNAME . ARGS) and
+	(apply DELTA BEG END FUNNAME . ARGS) instead of (FUNNAME . ARGS).
+
+	* buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
[phone]  Jesper Harder  <[e-mail]>
+
+	* macterm.c (syms_of_macterm) <mac-reverse-ctrl-meta>
+	<mac-emulate-three-button-mouse>: Fix docstring indentation.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* undo.c (syms_of_undo) <undo-outer-limit>: Doc update.
+	Increase value to 3 Meg.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (show_hourglass): Use FRAME_X_WINDOW as parent for GTK,
+	button events are not received otherwise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
+	* undo.c (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (access_keymap): YAILOM.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_phys_cursor_geometry): New function to calculate
+	phys cursor position and size for hollow cursor.  Position is
+	aligned with get_glyph_string_clip_rect and ensures that a hollow
+	cursor is shown, even when the actual glyph is not visible.
+
+	* dispextern.h (get_phys_cursor_geometry): Add prototype.
+
+	* xterm.c (x_clip_to_row): Ensure y >= 0.
+	(x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+	* w32term.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+	* macterm.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (x_error_quitter): Add a prototype.  Make it static again.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_glyph_string_clip_rect): Always show a cursor
+	glyph, even when row is only partially visible and actual cursor
+	position is not visible.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (x_error_quitter): No longer static, and moved after
+	x_error_handler.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_by_lines): If we move forward after going too
+	far back, cancel move if end position is same as start position.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* dispextern.h (struct glyph_string): New members clip_head and
+	clip_tail.
+
+	* xdisp.c (get_glyph_string_clip_rect): Restrict horizontal clip
+	region to the area between clip_head and clip_tail.
+	(draw_glyphs): Record the area that need to be actually redrawn to
+	the new variables clip_head and clip_tail when there are
+	overhangs.  Set values of these variables to the corresponding
+	members in struct glyph_string.  Refine x coordinates for
+	notice_overwritten_cursor using clip_head and clip_tail.
+
+	* macgui.h (STORE_XCHARSETSTRUCT): New macro.
+
+	* macterm.c (mac_compute_glyph_string_overhangs): Implement with
+	QDTextBounds.
+	(x_draw_glyph_string): Don't fill the background of the successor
+	of a glyph with a right overhang if the successor will draw a cursor.
+	(XLoadQueryFont): Obtain font metrics using QDTextBounds.
+	(x_redisplay_interface): Add entry for compute_glyph_string_overhangs.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based): Fix scrolling in the wrong
+	direction if window height was smaller than next-screen-context-lines.
+	Now always scroll at least one line in the requested direction.
+	Ensure that we actually do scroll backwards when requested to do so.
+
+	* xdisp.c (redisplay_window): Only try to make cursor line fully
+	visible once (to avoid redisplay loop).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (Fpos_visible_in_window_p): Simplify return value for
+	partially visible rows.
+	(window_scroll_pixel_based): Adapt to that change.
+
+	* window.c (window_scroll_pixel_based): Force moving to next line
+	if scrolling doesn't move start point, e.g. if looking at tall image.
+
+	* xdisp.c (pos_visible_p): Return 0 if non-interactive.
+	Clear last_height before calling line_bottom_y to get real height.
+	Fix calculation of y.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* s/darwin.h: Removed PTY_ITERATION from here.
+	(DARWIN): Define.
+
+	* process.c (init_process): Default process-connection-type to
+	nil on darwin 6 or less, t if it is 7 or higher.  This way the
+	broken pty behavior is still allowed on darwin 6 for interactive
+	processes for people that know what they are doing.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (auto_window_vscroll_p): New boolean.
+	(syms_of_window): DEFVAR_BOOL it.
+	(Fpos_visible_in_window_p): Extend return value to include RTOP
+	and RBOT values if FULLY is nil.
+	(window_scroll_pixel_based): Adjust vscroll for partially visible
+	rows if auto_window_vscroll_p is set.
+	(Fset_window_vscroll): Do nothing if vscroll is not modified.
+
+	* xdisp.c (pos_visible_p): Replace FULLY arg by RTOP and RBOT args
+	to return number of partially invisible pixels at top and bottom
+	of the dislay row at POS.
+
+	* lisp.h (pos_visible_p): Fix prototype.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Fcopy_file): Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw.
+	(xg_get_file_name): Move declaration ofx_use_old_gtk_file_dialog to
+	start of function for older compilers.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fmessage): If arg is "", return "" (as before).
+
+	* keymap.c (access_keymap): Protect from bad value of meta_prefix_char.
+
+	* .gdbinit (xgetptr, xgetint, xgettype): Copy $arg0 into a temp
+	variable.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* editfns.c (Voperating_system_release): Add.
+	(init_editfns): Assign new variable operating-system-release
+	based on call to uname if available.
+	(get_operating_system_release): Add function to
+	allow c-level access to operating system release.
+
+	* config.h: Regenerated.
+
+	* s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or less.
+	(MIN_PTY_KERNEL_VERSION): Define minimum kernel version for
+	using ptys as '7'.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (STRING_MARKED_P, VECTOR_MARKED_P): Return boolean.
+
+	* xterm.c (x_draw_glyph_string_box): Fix last_x for full width rows.
+	Thanks to Chong Yidong <[e-mail]> for debugging this.
+
+	* macterm.c (x_draw_glyph_string_box): Likewise.
+
+	* w32term.c (x_draw_glyph_string_box): Likewise.
+
+	* indent.c (Fvertical_motion): Temporarily disable selective display.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Fix :pointer
+	image property.
+
+	* fns.c (sweep_weak_table): Advance prev pointer when we keep a pair.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (fast_find_position): Backtrack to find first row if
+	charpos is inside a display overlay that spans multiple lines.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (decode_coding_iso2022): Translate invalid codes if
+	translation-table is specified.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (back_to_previous_visible_line_start): Undo 2004-12-28
+	change.  If handle_display_prop indicates newline is replaced by
+	image or text, move back to start of relevant overlay or interval
+	and continue scan from there.  Simplify.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (mode_line_string, marginal_area_string):
+	Fix off-by-one error in search for glyph.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macterm.c (syms_of_macterm) <mac-allow-anti-aliasing>: Doc fix.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (mac_to_x_fontname): Remove spurious argument.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
+	fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
+	(READABLE_EVENTS_FILTER_EVENTS, READABLE_EVENTS_IGNORE_SQUEEZABLES):
+	New flags for readable_events.
+	(get_filtered_input_pending, readable_filtered_events): Remove.
+	(tracking_off): Call readable_events and get_input_pending with
+	flag READABLE_EVENTS_DO_TIMERS_NOW.
+	(readable_events): Move code from old readable_filtered_events here,
+	but check new READABLE_EVENTS_* in argument flags instead of previous
+	two boolean arguments do_timers_now and filter_events.
+	If we are doing mouse tracking and the mouse moved, return only if
+	READABLE_EVENTS_IGNORE_SQUEEZABLES is not set in flags.
+	(swallow_events): Call get_input_pending with flag
+	READABLE_EVENTS_DO_TIMERS_NOW.
+	(get_input_pending): Move code from old get_filtered_input_pending
+	here.  Replace boolean arguments do_timers_now, filter_events with
+	flags, and pass flags to readable_events.  Document new
+	READABLE_EVENTS_* flags.
+	(detect_input_pending_ignore_squeezables): New function.
+	(detect_input_pending_run_timers): Call get_input_pending with flag
+	READABLE_EVENTS_DO_TIMERS_NOW.
+	(Finput_pending_p): Call get_input_pending with flags
+	READABLE_EVENTS_DO_TIMERS_NOW and READABLE_EVENTS_FILTER_EVENTS.
+
+	* dispnew.c (update_window, update_frame_1): Replace calls to
+	detect_input_pending with detect_input_pending_ignore_squeezables
+	so that redisplay is not paused if the event queue contains only
+	mouse movements.
+
+	* lisp.h: Declare detect_input_pending_ignore_squeezables.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (Vmac_use_core_graphics): Declare variable for
+	mac-allow-anti-aliasing.
+	(syms_of_macterm): DEFVAR_LISP and initialize it.
+	(mac_draw_string_common): Use core graphics text rendering if
+	mac-allow-anti-aliasing is enabled.
+
+	* macfns.c (Fx_file_dialog): Save As dialog includes only the
+	file name in the text box.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (x_set_foreground_color, x_set_background_color):
+	Sync with xfns.c.
+	(mac_window, x_create_tip_frame): Use XSetWindowBackground.
+	* macterm.c (XSetBackground, XSetWindowBackground): New functions.
+	* macterm.h (XSetBackground, XSetWindowBackground): Add externs.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (Fposn_at_x_y): Add optional arg WHOLE.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (Fcurrent_active_maps): Ignore Voverriding_local_map
+	if Voverriding_terminal_local_map is non-nil.
+
+	* keyboard.c (syms_of_keyboard): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): Fix last change.  Remove NO_PROPS arg
+	(specify 0 for FACE instead).  Reorder arg list.  Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): New arg FACE specifies a default
+	face property for characters that don't specify one.
+
+	* fns.c (Frequire): Record in load-history unconditionally.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (merge_faces): Rename from merge_into_realized_face.
+
+	* xfaces.c (merge_faces): Rename from merge_into_realized_face.
+	Callers changed.
+	Add support to merge with lisp face id too (if face_name is t).
+
+	* xdisp.c (get_next_display_element, next_element_from_display_vector):
+	Don't lookup lface_id from display table glyphs here; instead use
+	merge_faces to merge the lisp face id into current face.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct it): New member dpvec_face_id.
+	(merge_into_realized_face): Add prototype.
+
+	* xfaces.c (merge_into_realized_face): New function.  Used to
+	merge escape-glyph face or face from display table into current	face.
+
+	* xdisp.c (Vshow_nonbreak_escape): New lisp var.
+	(syms_of_xdisp): DEFVAR_LISP it.
+	(escape_glyph_face): Remove var.
+	(redisplay_window): Don't initialize it.
+	(setup_for_ellipsis, get_next_display_element):
+	Set it->dpvec_face_id to -1.
+	(get_next_display_element): Test Vshow_nonbreak_escape.
+	Do not setup escape_glyph_face.
+	Properly merge escape-glyph face or face from display table with
+	current face for escape and control characters.
+	Set it->dpvec_face_id to relevant face id instead of adding it to each
+	element of display vector.
+	(next_element_from_display_vector): If it->dpvec_face_id is set,
+	use that instead of lface_id from glyph itself.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h (struct x_output): New member, toolbar_detached.
+
+	* gtkutil.c (xg_create_frame_widgets): Set initial tool bar height to
+	38.
+	(xg_tool_bar_detach_callback): Set toolbar_detached to 1.
+	(xg_tool_bar_attach_callback): Set toolbar_detached to 0.
+	(xg_create_tool_bar): Initialize toolbar_detached.
+	(update_frame_tool_bar): Only set FRAME_TOOLBAR_HEIGHT (f) if
+	toolbar_detached is zero.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (create_and_show_popup_menu): Pass zero as button to
+	gtk_menu_popup if not for_click, so callbacks for the menu are called.
+
+	* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
+	(xg_tool_bar_callback, xg_tool_bar_help_callback)
+	(update_frame_tool_bar): Cast to EMACS_INT to avoid compiler warning.
+
+	* xselect.c (x_get_foreign_selection, x_fill_property_data)
+	(Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
+	XFLOAT_DATA to get extract number from Lisp object.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (set_iterator_to_next): Fix 2004-12-13 change.
+	Set stop_charpos to current charpos instead of 0.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): First arg now required.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (XLoadQueryFont): Correctly handle 0 size
+	font widths that are returned from some Japanese fonts.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (fringe_faces): Change to Lisp_Object pointer.
+	(draw_fringe_bitmap_1): Lookup user defined fringe faces here.
+	(destroy_fringe_bitmap): Set fringe_faces element to nil.
+	(Fdefine_fringe_bitmap, init_fringe): Change allocation of
+	fringe_faces array and init elements to nil.
+	(Fset_fringe_bitmap_face): Set fringe_faces to face name instead of
+	non-persistent face id.
+	(mark_fringe_data): New function for GC.
+
+	* alloc.c (mark_fringe_data): Declare extern.
+	(Fgarbage_collect): Call mark_fringe_data.
+
+	* alloc.c (overrun_check_free): Invalidate freed memory if
+	XMALLOC_CLEAR_FREE_MEMORY is defined.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c: Include sys/param.h.
+	[TARGET_API_MAC_CARBON] (mac_nav_event_callback): New declaration
+	and function.
+	[TARGET_API_MAC_CARBON] (Fx_file_dialog): Use MAXPATHLEN for size
+	of filename string.  Set event callback function when creating
+	dialog boxes.  Add code conversions for filenames.  Don't dispose
+	of apple event descriptor record if failed to create it.
+
+	* macterm.c: Include sys/param.h.
+	[USE_CARBON_EVENTS] (mac_handle_window_event): Add handler for
+	kEventWindowUpdate.
+	(install_window_handler) [USE_CARBON_EVENTS]: Register it.
+	(do_ae_open_documents) [TARGET_API_MAC_CARBON]: Get FSRef instead
+	of FSSpec from apple event descriptor record.
+	(do_ae_open_documents) [TARGET_API_MAC_CARBON]: Use MAXPATHLEN for
+	size of filename string.
+	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.
+	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a
+	file dialog is in action.
+	[TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.
+	Reject only when there are no filename items.  Set background color
+	before (un)highlighting the window below the dragged items.
+	(XTread_socket) [USE_CARBON_EVENTS]: Don't call do_window_update.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* term.c (encode_terminal_code): Fix buffer size computation.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (refill_memory_reserve): Move.
+	(emacs_blocked_free, emacs_blocked_malloc, emacs_blocked_realloc)
+	(reset_malloc_hooks, uninterrupt_malloc) [SYNC_INPUT]: Don't define.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based): Don't correct preserve_y
+	for CURRENT_HEADER_LINE_HEIGHT when moving backwards.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32bdf.c (w32_load_bdf_font): Set fontp->average_width and
+	fontp->space_width to FONT_WIDTH so they are valid.
+
+	* w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
+	average width.  Set fontp->average_width and fontp->space_width to
+	their appropriate values.
+
+	* w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
+	fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
+	fontp->space_width.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (x_new_font): Set FRAME_SPACE_WIDTH.
+	(x_font_min_bounds, XLoadQueryFont): Use the correct font width
+	metrics for max and min bounds.
+	(x_load_font): Correctly calculate average font width metrics.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* alloc.c (Fgarbage_collect): Don't truncate_undo_list on dead buffers.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): Clear area in expose event for GTK.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (setup_for_ellipsis, get_next_display_element):
+	Set it->ellipsis_p to 1 or 0.
+	(display_line): Record whether row ends in mid-ellipsis.
+	(set_cursor_from_row): If ends in ellipsis, find start of it.
+	(cursor_row_p): If PT's at the end of the ellipsis the row
+	ends within, don't display cursor on this row.
+
+	* dispextern.h (struct it): New element ellipsis_p.
+	(struct glyph_row): New element ends_in_ellipsis_p.
+
+	* xdisp.c (BUFFER_POS_REACHED_P): We haven't reached the specified
+	position if we're reading from something other than the buffer.
+
+	* window.c (window_scroll_pixel_based): Only look at
+	Vscroll_preserve_screen_position if the old PT can't be kept.
+	(syms_of_window) <scroll-preserve-screen-position>: Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_line_height_property): New function extracted from
+	original calc_line_height_property.
+	(calc_line_height_property): Rework.  Handle t and (nil . ratio).
+	(x_produce_glyphs): Use them to handle line-height and
+	line-spacing according to new height spec.
+	(Qtotal): Remove.
+	(syms_of_xdisp): Remove intern and staticpro for Qtotal.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents): Don't use
+	current_buffer->buffer_file_coding_system even if REPLACE is
+	non-nil.  Call Qafter_insert_file_set_coding with the second arg VISIT.
+
+	* fontset.h (struct font_info): New members space_width and
+	average_width.
+
+	* frame.h (struct frame): New member space_width.
+	(FRAME_SPACE_WIDTH): New macro.
+
+	* xterm.h (struct x_display_info): New member Xatom_AVERAGE_WIDTH.
+
+	* xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
+	fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
+	fontp->space_width.
+	(x_load_font): Calculate fontp->space_width and fontp->average_width.
+	(x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.
+
+	* xdisp.c (x_produce_glyphs): Calculate tab width by
+	FRAME_SPACE_WIDTH, not FRAME_COLUMN_WIDTH.
+
[phone]  Sanghyuk Suh  <[e-mail]>
+
+	* macterm.c (SelectionRange): Add Xcode position apple event struct.
+	(do_ae_open_documents): Handle Xcode-style file position open events.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <vertical-scroll-bar>: Correct typo.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <vertical-scroll-bar>: Doc fix.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (install_window_handler): Modify extern to return OSErr
+	value.
+	(mac_window): Handle return value of install_window_handler.
+
+	* macterm.c (reflect_byte): Remove function.
+	(mac_create_bitmap_from_bitmap_data): Don't call reflect_byte.
+	Lookup table instead.
+	(mac_do_font_lists): Simplify calculation of the longest
+	nonspecial string.
+	(init_mac_drag_n_drop): Remove function	and declaration.
+	(mac_initialize) [TARGET_API_MAC_CARBON]: Don't call
+	init_mac_drag_n_drop.
+	(mac_do_track_drag): New function and declaration.
+	(install_window_handler): Return OSErr value.
+	(install_window_handler) [TARGET_API_MAC_CARBON]:
+	Register handlers for tracking/receiving drag-and-drop items.
+	(do_ae_open_documents): Generate unibyte strings for filenames.
+	(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+	Reject only non-filename items.  Set event modifiers, and return value.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* coding.c (decode_coding): Fix previous change.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (back_to_previous_visible_line_start):
+	Don't call handle_display_prop.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* coding.c (decode_coding_XXX, decode_composition_emacs_mule)
+	(decode_coding_emacs_mule, encode_coding_emacs_mule)
+	(decode_coding_iso2022, encode_designation_at_bol)
+	(encode_coding_iso2022, decode_coding_sjis_big5, decode_eol)
+	(decode_coding): Constify arguments and local vars.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Only pop down dialogs
+	on C-g and Escape.
+	(popup_get_selection): Remove parameter down_on_keypress.
+	(create_and_show_popup_menu, create_and_show_dialog):
+	Remove parameter down_on_keypress to popup_get_selection.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* dispextern.h: Change HAVE_CARBON to MAC_OS.
+	(struct glyph_string): Likewise.
+
+	* emacs.c (main) [MAC_OS8]: Call mac_term_init instead of
+	mac_initialize.
+
+	* fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name):
+	Change TARGET_API_MAC_CARBON to HAVE_CARBON.
+
+	* fns.c (vector): Change MAC_OSX to MAC_OS.
+
+	* frame.c (x_set_frame_parameters, x_report_frame_params)
+	(x_set_fullscreen): Remove #ifndef HAVE_CARBON.
+	(x_set_border_width, Vdefault_frame_scroll_bars):
+	Change HAVE_CARBON to MAC_OS.
+
+	* image.c [MAC_OS]: Include sys/stat.h.
+	[MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
+	QuickTimeComponents.h.
+
+	* mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
+	[!MAC_OSX] (select): Use mac_wait_next_event.
+	[!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to Vexec_suffixes.
+	[!MAC_OSX] (select, run_mac_command): Change `#ifdef
+	TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
+	(mac_clear_font_name_table): Add extern.
+	(Fmac_clear_font_name_table): New defun.
+	(syms_of_mac): Defsubr it.
+	[MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define.
+	[MAC_OSX] (select_and_poll_event): New function.
+	[MAC_OSX] (sys_select): Use it.
+	[MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function.
+	[MAC_OSX && SELECT_USE_CFSOCKET]
+	(SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines.
+	[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and
+	RunLoop for simultaneously monitoring two kinds of inputs, window
+	events and process outputs, without periodically polling.
+
+	* macfns.c (mac_initialized): Remove extern.
+	(stricmp): Put in #if 0.  All callers changed to use xstricmp in
+	xfaces.c.
+	(strnicmp): Decrement `n' at the end of each loop, not the beginning.
+	(check_mac): Use the term "Mac native windows" instead of "Mac OS".
+	(check_x_display_info, x_display_info_for_name): Sync with xfns.c.
+	(mac_get_rdb_resource): New function (from w32reg.c).
+	(x_get_string_resource): Use it.
+	(install_window_handler): Add extern.
+	(mac_window): New function.
+	(Fx_create_frame): Use it instead of make_mac_frame.
+	Set parameter for Qfullscreen.  Call x_wm_set_size_hint.
+	(Fx_open_connection, Fx_close_connection): New defuns.
+	(syms_of_macfns): Defsubr them.
+	(x_create_tip_frame) [TARGET_API_MAC_CARBON]:
+	Add kWindowNoUpdatesAttribute to the window attribute.
+	(x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
+	(x_create_tip_frame): Don't call ShowWindow.
+	(Fx_show_tip): Call ShowWindow.
+	(Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if
+	TARGET_API_MAC_CARBON'.
+	(mac_frame_parm_handlers): Set handlers for Qfullscreen.
+	(syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
+
+	* macgui.h [!MAC_OSX]: Don't include Controls.h.  Include Windows.h.
+	(Window): Typedef to WindowPtr and move outside `#if
+	TARGET_API_MAC_CARBON'.
+	(XSizeHints): New struct.
+
+	* macterm.c (x_update_begin, x_update_end)
+	[TARGET_API_MAC_CARBON]: Disable screen updates during update of a
+	frame.
+	(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
+	[MAC_OS8]: Use XDrawImageString/XDrawImageString16.
+	(construct_mouse_click): Put in #if 0.
+	(x_check_fullscreen, x_check_fullscreen_move): Remove decls.
+	(x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef
+	TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
+	(activate_scroll_bars, deactivate_scroll_bars)
+	[!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl.
+	(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
+	if the position is neither user-specified nor program-specified.
+	(x_free_frame_resources): Free size_hints.
+	(x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
+	(mac_clear_font_name_table): New function.
+	(mac_do_list_fonts): Initialize font_name_table if needed.
+	(x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
+	around mac_do_list_fonts.
+	(mac_unload_font): New function.
+	(x_load_font): Add BLOCK_INPUT around XLoadQueryFont.
+	(init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations
+	and definitions with #if TARGET_API_MAC_CARBON.
+	[USE_CARBON_EVENTS] (mac_handle_window_event): Add decl.
+	(install_window_handler): Add decl.
+	(do_window_update): Add BeginUpdate/EndUpdate for the tooltip
+	window.  Use UpdateControls.  Get the rectangle that should be
+	updated and restrict the target of expose_frame to it.
+	(do_grow_window): Set minimum height/width according to size_hints.
+	(do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
+	(do_zoom_window): Don't use x_set_window_size.
+	[USE_CARBON_EVENTS] (mac_handle_window_event): New function.
+	(install_window_handler): New function.
+	[!USE_CARBON_EVENTS] (mouse_region): New variable.
+	[!USE_CARBON_EVENTS] (mac_wait_next_event): New function.
+	(XTread_socket) [USE_CARBON_EVENTS]: Move call to
+	GetEventDispatcherTarget inside BLOCK_INPUT.
+	(XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
+	Update mouse_region when mouse is moved.
+	(make_mac_frame): Remove.
+	(make_mac_terminal_frame): Put in #ifdef MAC_OS8.
+	Initialize mouse pointer shapes.  Change values of f->left_pos and
+	f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.
+	Don't call ShowWindow.
+	(mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
+	Vinvocation_name and Vsystem_name.
+	(mac_make_rdb): New function (from w32term.c).
+	(mac_term_init): Use it.  Add BLOCK_INPUT.  Error if display has
+	already been opened.  Don't pass argument to
+	mac_initialize_display_info.  Don't set dpyinfo->height/width.
+	Add entries to x_display_list and x_display_name_list.
+	(x_delete_display): New function.
+	(mac_initialize): Don't call mac_initialize_display_info.
+	(syms_of_macterm) [!MAC_OSX]: Don't call Fprovide.
+
+	* macterm.h (check_mac): Add extern.
+	(struct mac_output): New member size_hints.
+	(FRAME_SIZE_HINTS): New macro.
+	(mac_unload_font): Add extern.
+
+	* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
+
+	* xfaces.c (clear_font_table) [MAC_OS]: Call mac_unload_font.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
+	(syms_of_buffer): Don't defsubr it.
+
+	* process.c (list_processes_1): Set undo_list instead
+	of calling Fbuffer_disable_undo.
+
+	* xdisp.c (single_display_spec_string_p): Rename from
+	single_display_prop_string_p.
+	(single_display_spec_intangible_p): Rename from
+	single_display_prop_intangible_p.
+	(handle_single_display_spec): Rename from handle_single_display_prop.
+	Rewritten to be easier to understand.
+
+	Change in load-history format.  Functions now get (defun . NAME),
+	and variables get just NAME.
+
+	* data.c (Fdefalias): Use (defun . FN_NAME) in LOADHIST_ATTACH.
+
+	* eval.c (Fdefun, Fdefmacro): Use (defun . FN_NAME) in LOADHIST_ATTACH.
+	(Fdefvaralias, Fdefvar, Fdefconst): Use just SYM in LOADHIST_ATTACH.
+	(Qdefvar): Var deleted.
+	(syms_of_eval): Don't initialze it.
+
+	* lread.c (syms_of_lread) <load-history>: Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Pop down on C-g.
+	(set_frame_menubar): Install translations for Lucid/Motif/Lesstif that
+	pops down menu on C-g.
+	(xdialog_show): If dialog popped down and no button in the dialog was
+	pushed, call Fsignal to quit.
+	(xmenu_show): In no toolkit version, if menu returns NO_SELECT call
+	Fsignal to quit.
+
+	* xfns.c (Fx_file_dialog): Motif/Lesstif version: Pop down on C-g.
+
+	* gtkutil.c (xg_initialize): Install bindings for C-g so that
+	dialogs and menus pop down.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_region): Fix calculation of `ratio'.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (update_frame_tool_bar): Make the value of
+	tool-bar-button-margin control margins of images in tool bar.
+
+	* alloc.c (check_depth): New variable.
+	(overrun_check_malloc, overrun_check_realloc): Only add
+	overhead and write check pattern if check_depth is 1 (to handle
+	recursive calls).  Increase/decrease check_depth in entry/exit.
+	(overrun_check_free): Only check for overhead if check_depth is 1.
+	Increase/decrease check_depth in entry/exit.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* keyboard.c (input_available_signal): Call SIGNAL_THREAD_CHECK
+	before touching input_available_clear_time, to avoid accessing it
+	from multiple threads.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour
+	of JPEG library.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* emacs.c (main): If batch mode, set Vundo_outer_limit to nil.
+
+	* lisp.h (Vundo_outer_limit): Fix decl.
+
+	* undo.c (Vundo_outer_limit): Replaces undo_outer_limit.
+	Uses changed.
+	(syms_of_undo): Initialize appropriately.
+	(truncate_undo_list): If it's nil, there's no limit.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xselect.c (Fx_get_cut_buffer_internal): Return a unibyte string.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (unwind_to_catch): Clear immediate_quit.
+
+	* xdisp.c (get_next_display_element): Display codes 8a0 and 8ad
+	specially as `\ ' and `\-'.
+
+	* keyboard.c (kbd_buffer_store_event_hold):
+	In the code for while-no-input, handle immediate_quit.
+
+	* alloc.c (Fgarbage_collect): Update call to truncate_undo_list.
+	Call that at the very start.
+	(undo_limit, undo_strong_limit, undo_outer_limit): Move to undo.c.
+	(syms_of_alloc): Don't define undo-limit,
+	undo-strong-limit and undo-outer-limit here.
+
+	* undo.c (truncate_undo_list): Return void.
+	Take just one argument, the buffer.
+	Make it current, and inhibit recursive GC.
+	Access and update the undo list directly; return void.
+	Refer to the undo...limit variables directly.
+	Test undo_outer_limit only after counting the whole current command.
+	When it's exceeded, call the function in undo-outer-limit-function.
+	(undo_limit, undo_strong_limit, undo_outer_limit): From alloc.c.
+	(Vundo_outer_limit_function): New variable.
+	(syms_of_undo): Define undo-limit, undo-strong-limit
+	and undo-outer-limit here, and undo-outer-limit-function.
+	Doc fixes.
+
+	* lisp.h (truncate_undo_list): Update decl.
+
[phone]  Piet van Oostrum  <[e-mail]>
+
+	* fileio.c (Fread_file_name): Delete duplicates in
+	file-name-history when history_delete_duplicates is true.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_do_list_fonts): Fix memory leak
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.c (re_match_2_internal) <symend, wordend>:
+	Fix calls to UPDATE_SYNTAX_TABLE_FORWARD.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (endif, x_font_name_to_mac_font_name):
+	Use maccentraleurroman instead of maccentraleuropean
+	(mac_c_string_match, mac_do_list_fonts): Speed up font search by
+	quickly finding a specific font without needing regexps.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* syssignal.h: Declare main_thread.
+	(SIGNAL_THREAD_CHECK): New macro.
+
+	* keyboard.c (input_available_signal): Move thread checking code
+	to macro SIGNAL_THREAD_CHECK and call that macro.
+	(interrupt_signal): Call SIGNAL_THREAD_CHECK.
+
+	* alloc.c (uninterrupt_malloc): Move main_thread to emacs.c.
+
+	* emacs.c: Define main_thread.
+	(main): Initialize main_thread.
+	(handle_USR1_signal, handle_USR2_signal, fatal_error_signal)
+	(memory_warning_signal): Call SIGNAL_THREAD_CHECK.
+
+	* floatfns.c (float_error): Call SIGNAL_THREAD_CHECK.
+
+	* dispnew.c (window_change_signal): Call SIGNAL_THREAD_CHECK.
+
+	* sysdep.c (select_alarm): Call SIGNAL_THREAD_CHECK.
+
+	* process.c (send_process_trap, sigchld_handler):
+	Call SIGNAL_THREAD_CHECK.
+
+	* data.c (arith_error): Call SIGNAL_THREAD_CHECK.
+
+	* atimer.c (alarm_signal_handler): Call SIGNAL_THREAD_CHECK.
+
+	* xterm.c (xg_scroll_callback): Update XG_LAST_SB_DATA before
+	returning when xg_ignore_gtk_scrollbar is true.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (read_char): Save and restore echo_string when
+	handling input method.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (syms_of_eval) <quit-flag>: Doc fix.
+
+	* keyboard.c (Vthrow_on_input): New variable.
+	(syms_of_keyboard): Defvar and initialize it.
+	(kbd_buffer_store_event_hold): Handle Vthrow_on_input.
+
+	* lisp.h (QUIT): Check for Vthrow_on_input.
+	(Vthrow_on_input): Declare it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (set_iterator_to_next): Reset stop_charpos after display
+	vector.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* indent.c (Fvertical_motion): Call move_it_by_lines even if LINES = 0.
+
+	* minibuf.c (Fall_completions): Add var `zero' and use it in loop.
+	(Ftry_completion): Really use outer `zero'; eliminate inner one.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* term.c (encode_terminal_code): Fix previous change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (handle_async_input): Remove pthread mutex handling.
+	(input_available_signal): Move pthread thingy to !SYNC_INPUT branch.
+
+	* syntax.c (Fforward_word): Avoid non-idempotent side-effects
+	in macro arguments.
+
+	* minibuf.c (Ftry_completion, Fall_completions): Don't use
+	XFASTINT blindly.
+
+	* emacs.c (main, Fdump_emacs): Don't touch malloc hooks if SYNC_INPUT.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* w32term.c (x_calc_absolute_position): Remove calculation of
+	difference between inner and outer window.  Don't subtract difference
+	for left and top calculations.
+
+	* xterm.c (x_calc_absolute_position): Don't subtract outer_pixel_diff
+	for left and top calculations.  Remove call to x_real_positions.
+	[Bug report by Drew Adams in November]
+	(x_check_expected_move): Do not set change_gravity to 1 when calling
+	x_set_offset.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Use `escape-glyph' for
+	control chars and escaped octal codes.
+	(Qescape_glyph): New variable.
+	(syms_of_xdisp): Initialize it.
+	(escape_glyph_face): New variable.
+	(redisplay_window): Initialize it.
+
[phone]  Paul Eggert  <[e-mail]>
+
+	* image.c (our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE)
+	(init_image): Use 1 rather than TRUE.  TRUE's not always defined.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
+	reset_malloc_hooks.
+
+	* keyboard.c (handle_async_input, input_available_signal):
+	Add ! defined (SYSTEM_MALLOC) around thread code.
+
+	* alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (init_eval_once): Increase max_specpdl_size to 1000.
+
+	* config.in: Regenerate.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (Fx_popup_menu): Correct documentation about position.
+	(xmenu_show): Do not call XTranslateCoordinates.  Adjust position
+	if not given by a mouse click to correspond with x-popup-menu
+	documentation.
+
+	* config.in: Regenerate.
+
+	* gtkutil.c: Include signal.h and syssignal.h.
+	(xg_get_file_name): Block and unblock __SIGRTMIN if defined.
+
+	* alloc.c: If HAVE_GTK_AND_PTHREAD, include pthread.h,
+	new variables main_thread and alloc_mutex,
+	define (UN)BLOCK_INPUT_ALLOC to use alloc_mutex to protect
+	emacs_blocked_* calls and only do (UN)BLOCK_INPUT in the main thread.
+	If not HAVE_GTK_AND_PTHREAD, (UN)BLOCK_INPUT_ALLOC is the same as
+	(UN)BLOCK_INPUT.
+	(emacs_blocked_free, emacs_blocked_malloc)
+	(emacs_blocked_realloc): Use (UN)BLOCK_INPUT_ALLOC.
+	(uninterrupt_malloc): Initialize main_thread and alloc_mutex.
+	(reset_malloc_hooks): New function.
+
+	* lisp.h: Declare reset_malloc_hooks.
+
+	* emacs.c (Fdump_emacs): Call reset_malloc_hooks.
+
+	* keyboard.c: Conditionally include pthread.h
+	(handle_async_input, input_available_signalt): If not in the main
+	thread, block signal, send signal to main thread and return.
+
+	* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
+	Set current folder in file chooser if default_filename is a directory.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* regex.c (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
+	Remove redundant correctness checks.
+	(regex_compile): Fix up error codes for \{..\} expressions.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.c (regex_compile): Fix end-of-pattern case for space.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.h (cfstring_create_with_utf8_cstring): Add prototype.
+	* mac.c (cfstring_create_with_utf8_cstring): Add to prevent
+	crashes with invalid characters.
+	* macmenu.c (add_menu_item): Use it.
+	* image.c (image_load_quartz2d): Likewise.
+	* macfns.c (x_set_name, x_set_title): Likewise.
+	(Fx_file_dialog): Likewise.  Use constant CFRefs instead of
+	creating them each time for labels.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* config.in (RE_TRANSLATE_P): If make_number is not a macro,
+	don't use it here.
+
+	* eval.c (Fcalled_interactively_p): Don't check INTERACTIVE.
+	(interactive_p): Skip Scalled_interactively_p frames
+	like Sinteractive_p frames.
+	(unwind_to_catch): Clear handling_signal.
+
+	* data.c (Fmake_variable_buffer_local): Doc fix.
+	(Fmake_local_variable): Doc fix.
+
+	* insdel.c (insert_from_string_before_markers)
+	(insert_from_string): Don't modify buffer on empty insertion.
+
+	* window.c (Fget_lru_window, Fget_largest_window): Doc fixes.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macmenu.c (add_menu_item): Fallback on MacRoman if encoding
+	menu text as UTF8 fails.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c: Add commentary for last change.
+	(XMALLOC_PUT_SIZE, XMALLOC_GET_SIZE): New macros to handle
+	sizeof(size_t) != 4.
+	(overrun_check_malloc, overrun_check_realloc, overrun_check_free):
+	Use them.  Also clear header and trailer of freed memory.
+	(GC_STRING_OVERRUN_COOKIE_SIZE): Rename from GC_STRING_EXTRA.
+	(string_overrun_cookie): Rename from string_overrun_pattern.
+	(GC_STRING_EXTRA): Define from GC_STRING_OVERRUN_COOKIE_SIZE.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h: Declare string_to_multibyte.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* w32console.c (w32con_write_glyphs): Decide coding here.
+	Adjusted for the change of encode_terminal_code.
+
+	* term.c (encode_terminal_code): Don't make it "static".
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* term.c (encode_terminal_buf, encode_terminal_bufsize): New variables.
+	(encode_terminal_code): Argument changed.  Encode all
+	characters at once, and return a pointer to the result of encoding.
+	(write_glyphs): Decide coding here.  Adjusted for the above change.
+	(insert_glyphs): Likewise.
+	(term_init): Initialize encode_terminal_bufsize to 0.
+
+	* coding.c (Vcode_conversion_workbuf_name): New variable.
+	(syms_of_coding): Initialize and staticpro it.
+	(set_conversion_work_buffer): New function.
+	(run_pre_post_conversion_on_str): Use it.
+	(run_pre_write_conversin_on_c_str): New function.
+
+	* coding.h (run_pre_write_conversin_on_c_str): Extern it.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* keyboard.c: Don't undef SIGIO
+	* s/darwin.h (NO_SOCK_SIGIO): Define NO_SOCK_SIGIO on carbon
+	* Makefile.in (mac.o): Depend on blockinput.h and atimer.h.
+	(macfns.o): Don't depend on ccl.h.
+	* macfns.c (mac_frame_parm_handlers): Set handlers for
+	Qleft_fringe and Qright_fringe.
+	* macterm.c (mac_fill_rectangle_to_pixmap)
+	(mac_draw_rectangle_to_pixmap, mac_copy_area_to_pixmap)
+	(mac_copy_area_with_mask_to_pixmap, x_draw_image_foreground_1):
+	Put in #if 0.
+	(mac_scroll_area) [TARGET_API_MAC_CARBON]: Use ScrollWindowRect.
+	(x_flush) [TARGET_API_MAC_CARBON]: Don't traverse frames.
+	(XFlush) [TARGET_API_MAC_CARBON]: Define to an empty replacement.
+	(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
+	[!MAC_OS8]: Added ifdef'd out code for os8.  Don't use
+	XDrawImageString.  Always draw background and foreground separately.
+	(x_draw_image_foreground): Use clipping instead of computing the
+	intersection rectangle.
+	(x_draw_image_glyph_string): Don't draw an image with mask to a
+	pixmap.
+	(x_redisplay_interface): Set flush_display_optional member to 0.
+	(XTread_socket): Correctly reset the TEConverter
+	object.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lisp.h: New defines to enable buffer overrun checking.
+	(GC_CHECK_STRING_OVERRUN, GC_CHECK_STRING_FREE_LIST)
+	(XMALLOC_OVERRUN_CHECK, GC_CHECK_CONS_LIST): Add.
+
+	* alloc.c: Add more checks for buffer overruns.
+	(XMALLOC_OVERRUN_CHECK_SIZE, xmalloc_overrun_check_header)
+	xmalloc_overrun_check_trailer, overrun_check_malloc)
+	overrun_check_realloc, overrun_check_free): Add.
+	(GC_STRING_EXTRA, string_overrun_pattern): Add.
+	(check_sblock, allocate_string_data, compact_small_strings):
+	Set and check string_overrun_pattern if GC_CHECK_STRING_OVERRUN.
+	(check_cons_list): Condition on GC_CHECK_CONS_LIST.
+	(check_string_free_list): Add.
+	(allocate_string, sweep_strings): Call check_string_free_list.
+
+	* emacs.c (malloc_initialize_hook): Don't free malloc_state_ptr if
+	XMALLOC_OVERRUN_CHECK to avoid crash during load.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (concat): Use SAFE_ALLOCA.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* sysdep.c (emacs_write): Don't use QUIT.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* buffer.c (init_buffer): Set current_buffer->directory to a
+	multibyte string made by string_to_multibyte.
+
+	* emacs.c (init_cmdargs): Set unibyte strings in Vcommand_line_args.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* alloc.c (mark_stack): Call GC_MARK_SECONDARY_STACK if defined.
+
+	* s/gnu-linux.h: Enable no-op gcpros on ia64.
+	(GC_MARK_SECONDARY_STACK) [__ia64__]: Define.
+
+	* filelock.c (lock_file_1): Call get_boot_time early.
+	Increase buffer size.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* lisp.h (DECL_ALIGN): Define non-trivially only if NO_DECL_ALIGN
+	is not defined.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* search.c (syms_of_search) <search-spaces-regexp>: Move 'doc:'
+	marker out of doc string.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* s/darwin.h (POSIX_SIGNALS): Undo the removal of 2002-08-25,
+	which was not mentioned in the log.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (update_window_fringes): Prefer truncation bitmaps over
+	angle bitmaps at top/bottom line.
+
+	* xdisp.c: Undo recent changes for restoring saved_face_id.  Instead,
+	set it when it->method is set to next_element_from_display_vector.
+	(setup_for_ellipsis): Add LEN argument.  Callers changed.
+	Set it->saved_face_id.
+	(get_next_display_element): Use loop instead of recursion.
+	Set it->saved_face_id.  Combine duplicate code for ctr chars.
+	(next_element_from_display_vector): Do not set it->saved_face_id.
+	(next_element_from_ellipsis): Use setup_for_ellipsis.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* eval.c (Fdefvar): Declare pdl from last change as `volatile' to
+	prevent compiler warnings.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (command_loop_1): Print a message describing the key
+	the user just pressed when this key has no binding.
+
+	* sysdep.c (sys_signal): Don't use SA_RESTART if SYNC_INPUT is set.
+	(emacs_open, emacs_read, emacs_write): Check QUIT when interrupted.
+
+	* lread.c (readchar): Check QUIT when `getc' is interrupted.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* coding.c (run_pre_post_conversion_on_str): Bind Qinhibit_read_only.
+
+	* buffer.c (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_in_display_line_to, display_line):
+	Restore saved_face_id also when truncate-lines or hscrolled.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
+	x-use-old-gtk-file-dialog.
+
+	* xfns.c: Define x_use_old_gtk_file_dialog.
+	(syms_of_xfns): Rename use-old-gtk-file-dialog to x-...  Move it
+	outside ifdef USE_GTK.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* coding.h (ENCODE_FILE, DECODE_FILE, ENCODE_SYSTEM, DECODE_SYSTEM):
+	Don't use XFASTINT blindly.
+
+	* config.in (RE_TRANSLATE_P): Don't use XFASTINT blindly.
+
+	* indent.c (skip_invisible): Avoid non-idempotent side-effects
+	in macro arguments.
+
+	* keymap.c (Flookup_key): Check INTEGERP before XINT.
+
+	* lread.c (oblookup): Don't use XFASTINT blindly.
+
+	* window.c (Fset_window_scroll_bars): Don't use XINT if it isn't int.
+	(decode_next_window_args, window_loop): Don't use XFASTINT blindly.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P)
+	(MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Not if dpvec_index is zero.
+
+	* xfaces.c (lookup_named_face): Add signal_p arg.  Return -1 if
+	signal_p is zero and face name is unknown.
+	(Fx_list_fonts): Don't signal error in lookup_named_face.
+	(Fface_font): Signal error in lookup_named_face.
+	(ascii_face_of_lisp_face): Likewise.
+
+	* dispextern.h (lookup_named_face): Fix prototype.
+
+	* xdisp.c (handle_single_display_prop): Don't signal error in
+	lookup_named_face for unknown fringe face name.
+	(highlight_trailing_whitespace): Don't signal error in
+	lookup_named_face if trailing-whitespace face unknown.
+	(calc_line_height_property): Don't signal error in
+	lookup_named_face if specified face name is unknown.
+
+	* fringe.c (update_window_fringes): Show top row indicator if
+	window has header-line.  Don't show arrow at bob and eob
+	if the boundary indicators are not used.
+	(Fset_fringe_bitmap_face): Signal error in lookup_named_face.
+
+	* window.c (set_window_buffer): Clear display_error_modiff.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (update_window_fringes): Provide sensible fall-back
+	value for non-nil indicate-buffer-boundaries setting.
+
[phone]  Markus Rost  <[e-mail]>
+
+	* minibuf.c (Fminibuffer_complete_and_exit): Fix previous change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Fdefvar): Warn when var is let-bound but globally void.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (erase_phys_cursor): Clear hollow cursor inside TEXT_AREA.
+
+	* xterm.c (x_clip_to_row): Add area arg.  Callers changed.
+	(x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+
+	* w32term.c (w32_clip_to_row): Add area arg.  Callers changed.
+	(x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+
+	* macterm.c (x_clip_to_row): Add area arg.  Callers changed.
+	(x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
+
+	* xdisp.c (move_it_in_display_line_to, display_line):
+	Restore saved_face_id if overflow-newline-into-fringe is enabled and
+	line is continued before or in middle of element from display vector.
+
+	* indent.c (Fvertical_motion): Fix last change.  Use another
+	method to detect if iterator moved too far ahead after reseat.
+
+	* xdisp.c (IT_EXPAND_MATRIX_WIDTH): New macro.  Do not
+	expand matrix width for overflow in zero-width area.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Use it to avoid loop in redisplay.
+	(note_mode_line_or_margin_highlight): Don't let help-echo from
+	string override help-echo from image map.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Fyes_or_no_p): Call Fread_from_minibuffer with extra argument.
+	* callint.c (Fcall_interactively): Ditto.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (Fminibuffer_complete_and_exit):
+	Fixup the case of the completed value, for case-indep completion.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lisp.h (Fread_from_minibuffer): Add arg in decl.
+
+	* minibuf.c (read_minibuf): New arg KEEP_ALL.  Callers changed.
+	(Fread_from_minibuffer): New arg KEEP_ALL.  Callers changed.
+
+	* search.c (Vsearch_spaces_regexp):
+	Rename from Vsearch_whitespace_regexp.  All uses changed.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* eval.c (init_eval_once): Increase `max_specpdl_size' to 650.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (Vsearch_whitespace_regexp): New variable.
+	(syms_of_search): Defvar it.
+	(compile_pattern_1): Call re_set_whitespace_regexp with it.
+	(search_buffer): No regexp is trivial if Vsearch_whitespace_regexp
+	is non-nil.
+	(struct regexp_cache): New element whitespace_regexp.
+	(syms_of_search): Initialize whitespace_regexp elements.
+	(compile_pattern): Compare whitespace_regexp elements.
+	(compile_pattern_1): Set whitespace_regexp elements.
+
+	* regex.c (regex_compile): Substitute whitespace_regexp
+	for spaces, if it is nonzero.
+	(whitespace_regexp): New variable.
+	(re_set_whitespace_regexp): New function.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* indent.c (Fvertical_motion): Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* indent.c (Fvertical_motion): Undo 2004-11-16 change.
+	Instead, move back again if reseating moves too far ahead.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* xdisp.c (message3): Call clear_message.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (erase_phys_cursor): Adjust cursor row visible height.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_file_name): Typo in HAVE_GTK_FILE_SELECTION_NEW.
+
+	* xmenu.c (x_menu_in_use): Remove.
+	(x_menu_set_in_use): Also set popup_activated_flag.
+
+	* xfns.c (Fx_file_dialog): Call popup_activated instead of
+	x_menu_in_use.  Call x_menu_set_in_use in Motif version also.
+
+	* xterm.h (x_menu_in_use): Remove.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (Fmap_keymap): New arg SORT-FIRST.
+	Use map-keymap-internal to implement that.
+
+	* indent.c (Fvertical_motion): In batch mode, use vmotion directly.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (get_glyph_string_clip_rect, init_glyph_string): Check it's
+	a window before using XWINDOW.
+
+	* window.c (make_window, Fselect_window, make_dummy_parent)
+	(save_window_save):
+	* frame.c (make_frame):
+	* fns.c (concat): Avoid side-effects inside XSETFASTINT's arguments.
+
+	* lisp.h (NILP): Use EQ rather than XFASTINT.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (Fdefine_fringe_bitmap): Always set 'h'.  Simplify.
+
+	* indent.c (Fvertical_motion): Fix last change.  Only reseat when
+	moving backwards.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* dispextern.h: Extern reseat_at_previous_visible_line_start.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (display_mode_element): Fix previous change (calculate
+	end position of substring to display correctly).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (Fposn_at_point): Remove extra */ after doc string.
+	Reported by Andrew M. Scott.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (Fsafe_plist_get): New defun.
+	(syms_of_fns): Defsubr it.
+
+	* lisp.h (Fsafe_plist_get): Add EXFUN.
+
+	* xdisp.c (store_mode_line_string, produce_stretch_glyph):
+	Use Fsafe_plist_get.
+	(note_mode_line_or_margin_highlight, note_mouse_highlight):
+	Fix image map element parsing.  Use Fsafe_plist_get.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Fix previous change.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* window.c (shrink_windows): Handle special case of one window left
+	when trying to shrink the final reminder.  Grow windows if
+	total_removed is less than total_shrink.
+
+	* xmenu.c (pop_down_menu): Remove global variable current_menu,
+	extract pointer from arg with XSAVE_VALUE.
+	(create_and_show_popup_menu, create_and_show_dialog, xmenu_show):
+	Construct arg to record_unwind_protect with make_save_value.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (reseat_at_previous_visible_line_start): No longer static.
+	(get_next_display_element): Fix previous change to apply only to \n.
+
+	* indent.c (Fvertical_motion): Scan to PT from start of line to
+	make iterator consistent.
+
+	* minibuf.c (syms_of_minibuf) <completion-ignore-case>: Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (pop_down_file_dialog): Add BLOCK_INPUT.
+
+	* xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
+	Record unwind with clean_up_file_dialog.
+
+	* xterm.h (x_menu_in_use, x_menu_set_in_use, x_menu_wait_for_event):
+	Declare.
+
+	* xmenu.c (x_menu_in_use, x_menu_set_in_use): New functions.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
+	(xg_file_sel_destroy): Remove.
+	(xg_file_response_cb, pop_down_file_dialog)
+	(xg_get_file_name_from_chooser, xg_get_file_name_from_selector):
+	New functions.
+	(xg_get_file_with_chooser, xg_get_file_with_selection):
+	Take new arg func, set it to xg_get_file_name_from_chooser/selector.
+	Move common code to xg_get_file_name.  Return widget created.
+	(xg_get_file_name): Set name, transient for, modal and destroy
+	with parent here.  Connect response signal to xg_file_response_cb,
+	connect delete-event to gtk_true.  Record pop_down_file_dialog
+	for unwind.  Do event loop and call x_menu_wait_for_event in loop.
+	(xg_create_widget): Make dialogs modal.
+
+	* xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
+	Lisp_Object.
+	(popup_get_selection): Move unwind protect ...
+	(create_and_show_popup_menu, create_and_show_dialog): ... to here.
+	Move destroy of widget to pop_down_menu.
+	(popup_widget_loop): Move unwind protect ...
+	(create_and_show_popup_menu, create_and_show_dialog): ... to here.
+	Move destroy of widget to pop_down_menu.
+	(pop_down_menu): BLOCK_INPUT and destroy widget/window.
+	(xmenu_show): Record unwind pop_down_menu.  Move XMenuDestroy,
+	x_mouse_leave and grabbed = 0 to pop_down_menu.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (make_cursor_line_fully_visible_p): New variable.
+	(syms_of_xdisp): DEFVAR_BOOL it.
+	(make_cursor_line_fully_visible, try_cursor_movement)
+	(try_window_id): Use it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct glyph_row): New member extra_line_spacing.
+	(struct it): New member max_extra_line_spacing.
+	(MR_PARTIALLY_VISIBLE, MR_PARTIALLY_VISIBLE_AT_TOP)
+	(MR_PARTIALLY_VISIBLE_AT_BOTTOM): New helper macros.
+	(MATRIX_ROW_PARTIALLY_VISIBLE_P): Fix to return false if invisible
+	part of last line is only extra line spacing (so the text on the
+	line is fully visible).  Use helper macros.
+	Add W arg (to use them).  All callers changed.
+	(MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P)
+	(MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P): Use helper macros.
+
+	* window.c (window_scroll_pixel_based, Frecenter):
+	Use move_it_vertically_backward directly.
+	(Frecenter): Fix calculation of new start pos for negative arg.
+	Before, the new start pos was sometimes chosen too far back, so
+	the last line became only partially visible, and thus would be
+	either only semi-visible or automatically scrolled to the middle
+	of the window by redisplay.
+
+	* xdisp.c (init_iterator): Clear it.max_extra_line_spacing.
+	(move_it_vertically_backward): Don't recure to move further back.
+	(move_it_vertically): Remove superfluous condition.
+	(move_it_by_lines): Clear last_height when moved 0 lines.
+	(resize_mini_window): Use it.max_extra_line_spacing.
+	(display_tool_bar_line): Clear row->extra_line_spacing.
+	(try_scrolling): Use move_it_vertically_backward directly.
+	(redisplay_window): Likewise.
+	(compute_line_metrics): Set row->extra_line_spacing.
+	(display_line, display_string): Likewise.
+	(x_produce_glyphs): Update it->max_extra_line_spacing.
+
+	* xmenu.c (pop_down_menu): Return nil.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (x_menu_wait_for_event): New function.
+	(popup_get_selection, popup_widget_loop): Call x_menu_wait_for_event
+	to handle timers.
+	(popup_widget_loop): Add argument do_timers.
+	(create_and_show_popup_menu, create_and_show_dialog): Pass 1 for
+	do_timers to popup_widget_loop.
+	(xmenu_show): Call XMenuActivateSetWaitFunction so that
+	x_menu_wait_for_event is called by XMenuActivate.
+	(create_and_show_popup_menu): Pass 1 for do_timers to
+	popup_get_selection.
+	(pop_down_menu): New function.
+	(popup_get_selection, popup_widget_loop): Unwind protect to
+	pop_down_menu.
+	(popup_widget_loop): Add argument widget.
+	(create_and_show_popup_menu, create_and_show_dialog): Pass new
+	argument widget to popup_widget_loop.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (Fkeymap_prompt): Accept symbol keymaps.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xselect.c: Include <sys/types.h> and <unistd.h> (for getpid).
+	Fix various comments referring to XEvents instead of input events.
+	(x_queue_event): Fix format strings.
+	(x_stop_queuing_selection_requests): Likewise.
+
+	* xdisp.c (produce_image_glyph): Remove unused variable 'face_ascent'.
+	(pint2hrstr): Add extra braces to silence compiler.
+
+	* print.c (print_object): Fix format string.
+
+	* lread.c (read1): Fix next_char matching.
+
+	* lisp.h (Fdelete): Add EXFUN.
+	(replace_range_2): Add prototype.
+
+	* keyboard.c (read_avail_input): Remove unused variable 'discard'.
+
+	* intervals.h (NULL_INTERVAL_P): Add separate version when
+	ENABLE_CHECKING is not defined to silence compiler.
+	(compare_string_intervals): Add prototype.
+
+	* fringe.c (destroy_fringe_bitmap): Fix return type.
+	(Ffringe_bitmaps_at_pos): Remove unused var 'old_buffer'.
+
+	* emacs.c (Fdump_emacs): Fix format string.
+
+	* doc.c: Include <ctype.h>.
+	(Fsubstitute_command_keys): Remove unused variable 'firstkey'.
+
+	* data.c (store_symval_forwarding): Remove unused variables.
+
+	* callint.c (Fcall_interactively): Remove unused variable 'funcar'.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
+	to ${OLDXMENU}.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fmake_network_process): Remove kludge for interrupted
+	connects on BSD.  If connect is interrupted, just close socket and
+	start over rather than sleeping and retry with same socket.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* .cvsignore: Add buildobj.lst.
+
+	* doc.c: New variable Vbuild_files.
+	(Fsnarf_documentation): If Vbuild_files is nil, populate it with
+	file names from buildobj.lst.  Only attach docstrings from files
+	that are in Vbuild_files.
+	(syms_of_doc): Defvar Vbuild_files.
+
+	* Makefile.in (SOME_MACHINE_OBJECTS): Add fringe.o, image.o
+	and w32*.o.
+	(temacs${EXEEXT}): Generate buildobj.lst when temacs is linked.
+	(mostlyclean): Rm buildobj.lst
+
+	* makefile.w32-in ($(TEMACS)): Generate buildobj.lst when temacs
+	is linked.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (update_window_fringes): Update fringe bitmaps if
+	cur and row ends_at_zv_p differs.  If bitmaps of a row is updated,
+	also update previous row to get rid of misc. artifacts.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (fast_find_position): Fix start pos if header line present.
+	(note_mouse_highlight): Clear mouse face if we move out of text area.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* editfns.c: Move #include "systime.h" before <sys/resource.h>.
+	Don't include <sys/time.h> explicitly.
+	Include <stdio.h> unconditionally, not just on MacOS.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fontset_pattern_regexp): Cancel my previous change;
+	don't pay attention to '\' before '*'.
+	(fontset_pattern_regexp): Change the meaning of the second arg.
+	(Fnew_fontset): Call fs_query_fontset, not Fquery_fontset.
+	(check_fontset_name): Try NAME as literal at first, and if it
+	failes, try NAME as pattern.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* emacs.c (Fdump_emacs): Only output warning on GNU/Linux.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h (Fmsdos_downcase_filename): Declare.
+	* dired.c (Fmsdos_downcase_filename): Don't declare here.
+	* fileio.c: Likewise.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
+	comparisons with integers instead of Lisp_Object address.
+	(Fmsdos_set_keyboard): Declare argument allkeys.
+
+	* msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.
+
+	* dired.c (Fmsdos_downcase_filename): Declare extern on MSDOS to avoid
+	int/Lisp_Object mixup.
+
+	* fileio.c: Ditto.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* editfns.c: Need to include sys/time.h before resource.h on darwin.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Avoid reusing EVENT for other data.
+
+	* xfaces.c (merge_named_face): GCPRO the face_name in the
+	named_merge_point struct that we make.
+	(merge_face_heights): Eliminate GCPRO arg.  All callers changed.
+
+	* keyboard.c (command_loop_1): Change Vtransient_mark_mode
+	before deciding whether to inactivate mark.
+
[phone]  Lars Brinkhoff  <[e-mail]>
+
+	* config.in: Regenerate (add HAVE_GETRUSAGE).
+	* editfns.c (Fget_internal_run_time): New function.
+	(syms_of_data): Defsubr it.
+	* fns.c (sxhash): As far as possible, merge calculation of
+	hash code for symbols and strings.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* frame.c (syms_of_frame): Fix the example in the doc string.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* eval.c (Feval): Remove check for INPUT_BLOCKED_P.
+
+	* xmenu.c (popup_get_selection, create_and_show_popup_menu)
+	(create_and_show_dialog): Revert change from 2004-10-31.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* macros.c (syms_of_macros) <defining-kbd-macro>: Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* print.c (print_object): Print Lisp_Misc_Save_Value objects.
+
+	* fileio.c (Ffile_modes): Doc fix.
+	(auto_save_1): Check for Ffile_modes nil value.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xselect.c (struct selection_event_queue, selection_queue)
+	(x_queue_selection_requests, x_queue_event)
+	(x_start_queuing_selection_requests)
+	(x_stop_queuing_selection_requests): Add new queue for selection
+	input events to replace previous XEvent queue in xterm.c.
+	(queue_selection_requests_unwind): Adapt to new queue.
+	(x_reply_selection_request): Adapt to new queue.
+	Unexpect wait_object in case of x errors (memory leak).
+	(x_handle_selection_request, x_handle_selection_clear): Make static.
+	(x_handle_selection_event): New function.  May queue selection events.
+	(wait_for_property_change_unwind): Use save_value instead of cons.
+	Clear property_change_reply_object.
+	(wait_for_property_change): Abort if already waiting.
+	Use save_value instead of cons for unwind data.
+	(x_handle_property_notify): Skip events already arrived, but don't
+	free them, as "arrived" field is checked by wait_for_property_change,
+	and it will be freed by unwind or explicit unexpect_property_change.
+	(x_get_foreign_selection): Add to new queue.
+	(receive_incremental_selection): Don't unexpect wait_object when done
+	as it has already been freed by previous wait_for_property_change.
+
+	* xterm.h (x_start_queuing_selection_requests)
+	(x_stop_queuing_selection_requests, x_handle_selection_request)
+	(x_handle_selection_clear): Remove prototypes.
+	(x_handle_selection_event): Add prototype.
+
+	* xterm.c (handle_one_xevent): Don't queue X selection events
+	here, it may be too late if we start queuing after we have already
+	stored some selection events into the kbd buffer.
+	(struct selection_event_queue, queue, x_queue_selection_requests)
+	(x_queue_event, x_unqueue_events, x_start_queuing_selection_requests)
+	(x_stop_queuing_selection_requests): Remove/move to xselect.c.
+	(x_catch_errors_unwind): Block input around final XSync.
+
+	* keyboard.h (kbd_buffer_unget_event): Add prototype.
+
+	* keyboard.c (kbd_buffer_store_event_hold): Remove obsolete code.
+	(kbd_buffer_unget_event): New function.
+	(kbd_buffer_get_event, swallow_events): Combine SELECTION events
+	and use x_handle_selection_event.
+	(mark_kboards): Don't mark x and y of SELECTION_CLEAR_EVENT.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xselect.c (TRACE3): New debug macro.
+	(x_reply_selection_request): Use it.
+	(receive_incremental_selection): In call to TRACE0, the name of
+	a symbol is in xname.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fontset.c (fontset_pattern_regexp): Use unsigned char.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* fileio.c (Fnext_read_file_uses_dialog_p): New function.
+
+	* gtkutil.h (use_old_gtk_file_dialog): Declare.
+
+	* gtkutil.c: Make use_old_gtk_file_dialog non-static.
+	(xg_initialize): Move DEFVAR_BOOL for use_old_gtk_file_dialog ...
+	* xfns.c (syms_of_xfns): ... to here.
+
+	* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
+	it doesn't start with /.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fontset_pattern_regexp): If '*' is preceded by '\',
+	treat it as a literal character.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* .gdbinit (ppt): New function.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_window_to_scroll_bar): Only call
+	xg_get_scroll_id_for_window if toolkit scroll bars are used.
+
+	* gtkutil.c (xg_get_file_with_chooser): Use GTK_STOCK_OK instead
+	of save.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* window.c (Fscroll_right): Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* Makefile.in (callproc.o): Depend on blockinput.h atimer.h systime.h.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* callproc.c (Fcall_process): Block input around vfork.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* eval.c (Fcalled_interactively_p): Rename from Fcall_interactive_p.
+	(syms_of_eval): Defsubr it.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* insdel.c (replace_range_2): New function.
+
+	* casefiddle.c (casify_region): Handle changes in byte-length
+	using replace_range_2.
+
+	* emacs.c (USAGE3): Delete --horizontal-scroll-bars, -hb.
+
+	* xdisp.c (back_to_previous_visible_line_start):
+	Subtract 1 from pos when checking previous newline for invisibility.
+
+	* window.c (window_scroll_pixel_based): Update preserve_y
+	for header line if any.
+	(Fscroll_left, Fscroll_right): Don't call interactive_p;
+	use a new second argument instead.
+
+	* eval.c (Fcall_interactive_p): New function.
+	(interactive_p): Don't test INTERACTIVE here.
+	(Finteractive_p): Doc fix.
+
+	* eval.c (Feval): Abort if INPUT_BLOCKED_P.
+
[phone]  KOBAYASHI Yasuhiro  <[e-mail]>
+
+	* w32fns.c (w32_font_match): Use fast_string_match_ignore_case for
+	comparing font names.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
+	Fx_file_dialog if only directories should be read.
+
+	* lisp.h: Fx_file_dialog takes 5 parameters.
+
+	* xfns.c (Fx_file_dialog): Both Motif and GTK version:
+	Add parameter only_dir_p.
+	In Motif version, don't put DEFAULT_FILENAME in filter part of the
+	dialog, just text field part.  Do not add DEFAULT_FILENAME
+	to list of files if it isn't there.
+	In GTK version, pass only_dir_p parameter to xg_get_file_name.
+
+	* macfns.c (Fx_file_dialog): Add parameter only_dir_p.
+	Check only_dir_p instead of comparing prompt to "Dired".  When using
+	a save dialog, add option kNavDontConfirmReplacement, change title
+	to "Enter name", change text for save button to "Ok".
+
+	* w32fns.c (Fx_file_dialog): Add parameter only_dir_p.
+	Check only_dir_p instead of comparing prompt to "Dired".
+
+	* gtkutil.c (xg_get_file_with_chooser)
+	(xg_get_file_with_selection): New functions, only defined ifdef
+	HAVE_GTK_FILE_CHOOSER_DIALOG_NEW and HAVE_GTK_FILE_SELECTION_NEW
+	respectively.
+	(xg_get_file_name): Add parameter only_dir_p.
+	Call xg_get_file_with_chooser or xg_get_file_with_selection
+	depending on HAVE_GTK_FILE* and the value of use_old_gtk_file_dialog.
+	(xg_initialize): New DEFVAR_BOOL use_old_gtk_file_dialog.
+
+	* gtkutil.h (xg_get_file_name): Add parameter only_dir_p.
+
+	* config.in: Rebuild (added HAVE_GTK_FILE_*).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (connect_wait_mask, num_pending_connects):
+	Only declare and use them if NON_BLOCKING_CONNECT is defined.
+	(init_process): Initialize them if NON_BLOCKING_CONNECT defined.
+	(IF_NON_BLOCKING_CONNECT): New helper macro.
+	(wait_reading_process_output): Only declare and use local vars
+	Connecting and check_connect when NON_BLOCKING_CONNECT is defined.
+
[phone]  Andy Petrusenco  <[e-mail]>  (tiny change)
+
+	* w32term.c (x_scroll_run): Delete region objects after use.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c: Add prototypes for forward function declarations.
+	(popup_get_selection): Remove parameter do_timers, remove call to
+	timer_check.
+	(create_and_show_popup_menu, create_and_show_dialog):
+	Remove parameter do_timers from call to popup_get_selection.
+
+	* xdisp.c (update_tool_bar): Pass a copy of f->tool_bar_items to
+	tool_bar_items and assign the result to f->tool_bar_items if
+	not equal.  Move BLOCK/UNBLOCK_INPUT from around call to
+	tool_bar_items to assignment of result.
+
+	* atimer.c (alarm_signal_handler): Do not call set_alarm if
+	pending_atmers is non-zero.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (margin_glyphs_to_reserve): Don't use ncols_scale_factor.
+
[phone]  Will  <[e-mail]>
+
+	* macterm.c: Allow user to assign key modifiers to the Mac Option
+	key via a 'mac-option-modifier' variable.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xselect.c (Vx_lost_selection_functions, Vx_sent_selection_functions):
+	Rename from Vx_lost_selection_hooks and Vx_sent_selection_hooks.
+	(x_handle_selection_request, x_handle_selection_clear)
+	(x_clear_frame_selections, syms_of_xselect): Adjust accordingly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* w32fns.c (Fx_server_vendor, Fx_server_version): Doc fixes.
+
+	* xfns.c (Fx_server_vendor, Fx_server_version): Doc fixes.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (scan_sexps_forward): Give precedence to a 2-char
+	comment-starter over a 1-char one.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): In mode lines,
+	treat newline and tab like other control characters.
+
+	* editfns.c (Fmessage): Doc fix.
+
+	* indent.c (vmotion): When moving up, check the newline before.
+	Make prevline an int, not a Lisp_Object.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Fformat): Allocate discarded table with SAFE_ALLOCA.
+	Only allocate info and discarded tables once.
+
+	* lisp.h (USE_SAFE_ALLOCA): Add and init sa_must_free integer.
+	(SAFE_ALLOCA, SAFE_ALLOCA_LISP): Increment it when malloc is used.
+	(SAFE_FREE): Test it to determine if we need to unwind to free.
+	Remove size arg.  All users changed.
+	(SAFE_FREE_LISP) Remove.  All users changed to use SAFE_FREE.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c: Put empty line between comment and function body.
+	(xg_destroy_widgets): Rename from remove_from_container.
+	Just destroy all widgets in list.  Argument wcont removed.
+	(xg_update_menubar, xg_update_submenu): Call xg_destroy_widgets
+	instead of remove_from_container.
+	(xg_display_close, xg_create_tool_bar, update_frame_tool_bar)
+	(free_frame_tool_bar): Add comment.
+
+	* xfns.c (xic_create_xfontset): Check that FRAME_XIC_BASE_FONTNAME
+	is not NULL before strcmp.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Add 'U' code to get the
+	up-event discarded by a previous 'k' or 'K' argument.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Fix a few typos.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xsmfns.c: Put empty line between comment and function body.
+	Use two spaces before comment end.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fontset_pattern_regexp): Optimize for the case that
+	PATTERN is full XLFD.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* regex.h (enum reg_errcode_t): New value REG_ERANGEX.
+
+	* regex.c (re_error_msgid): Add an entry for REG_ERANGEX.
+	(regex_compile): Return REG_ERANGEX if appropriate.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* editfns.c (Ftranslate_region_internal): New function.
+	(syms_of_editfns): Defsubr it.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
+
[phone]  K,Ba(Broly L,Bu(Brentey  <[e-mail]>
+
+	* xterm.h (x_output): New member `xic_base_fontname'.
+	(FRAME_XIC_BASE_FONTNAME): New macro.
+	(xic_free_xfontset): Declare.
+
+	* xfns.c (xic_create_xfontset): Share fontsets between frames
+	based on base_fontname.
+	(xic_free_xfontset): New function.
+	(free_frame_xic): Use it.
+	(xic_set_xfontset): Ditto.
+
+	* xterm.c (xim_destroy_callback): Ditto.
+
+
[phone]  B. Anyos  <[e-mail]>  (tiny change)
+
+	* w32term.c (x_draw_glyph_string): Use overline_color for overlines.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h (XSync): If USE_GTK, define XSync as process_all and then
+	XSync.
+
+	* emacs.c (my_heap_start, heap_bss_diff, MAX_HEAP_BSS_DIFF):
+	New variables and constant.
+	(main): Calculate heap_bss_diff.  If we are dumping and the
+	heap_bss_diff is greater than MAX_HEAP_BSS_DIFF, set PER_LINUX32
+	and exec ourself again.
+	(Fdump_emacs): If heap_bss_diff is greater than MAX_HEAP_BSS_DIFF
+	print a warning.
+
+	* lastfile.c: Make my_endbss and my_endbss_static available on all
+	platforms.
+
+	* Makefile.in (RUN_TEMACS): Remove @SETARCH@.
+	* config.in (HAVE_PERSONALITY_LINUX32): Regenerate.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* data.c (Flocal_variable_if_set_p): Doc fix.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32.c (init_environment): Set emacs_dir correctly when running
+	emacs from the build directory.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fdelete_and_extract_region):
+	If region is empty, return null string.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.h (xg_update_scrollbar_pos): Remove arguments real_left
+	and canon_width.
+	(xg_frame_cleared): Remove.
+
+	* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose)
+	(xg_find_top_left_in_fixed): Remove.
+	(xg_create_scroll_bar): Put an event box widget between
+	the scroll bar widget and the edit widget.
+	(xg_show_scroll_bar): Show the parent widget (the event box).
+	(xg_remove_scroll_bar): Destroy parent (the event box) also.
+	(xg_update_scrollbar_pos): Remove arguments real_left and canon_width.
+	Move the parent (the event box) widget inside the fixed widget.
+	Move window clear to xterm.c.
+
+	* gtkutil.h (xg_frame_cleared): Remove.
+
+	* xterm.c (x_clear_frame): Remove call to xg_frame_cleared
+	(x_scroll_bar_create, XTset_vertical_scroll_bar):
+	Remove arguments left and width to xg_update_scrollbar_pos.
+	(XTset_vertical_scroll_bar): Do x_clear_area for USE_GTK also.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (display_mode_element): Fix display of wide chars.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_update_scrollbar_pos): Change XClearWindow to
+	gdk_window_clear and move gdk_window_process_all_updates after
+	clear so events are sent to the X server in correct order.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fs_load_font): Use fast_string_match_ignore_case for
+	comparing font names.
+	(fs_query_fontset): Use fast_string_match for comparing fontset names.
+	(list_fontsets): Likewise.
+
+	* search.c (fast_string_match_ignore_case): New function.
+
+	* lisp.h (fast_string_match_ignore_case): Extern it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (overlay_arrow_at_row): Return overlay string rather
+	than bitmap if there is not left fringe.
+	(get_overlay_arrow_glyph_row): Also used on windows system.
+	(display_line): Display overlay string if no left fringe.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (w32_font_match): Encode font name being matched.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fspecial_display_p): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* doc.c (Fsubstitute_command_keys): Fix remap-handling.
+	Don't ignore menus, because where-is-internal already does it for us.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_window): Only update fringes and vertical
+	border on window frames.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* m/ia64.h (DATA_SEG_BITS): Don't define.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.h: Include Xutil.h after keysym.h to work around bug
+	in some X versions.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fns.c (map_char_table): Add missing gcpros.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (get_keymap): An autoload form is not a keymap.
+
+	* textprop.c (syms_of_textprop): Make `syntax-table' nonsticky.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* callproc.c (Fcall_process): Simplify handling of display arg.
+	Resume `display_on_the_fly' once a coding system is determined.
+
+	* xdisp.c (redisplay_preserve_echo_area): Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_preserve_echo_area): Flush display in case
+	caller, such as call-process, is not going to poll for input.
+	(calc_line_height_property): Handle case where it->object is nil.
+
+	* xterm.c (x_redisplay_interface): Fix flush_display_optional.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (get_next_display_element):
+	If unibyte_display_via_language_environment is zero, display 8-bit
+	chars in octal in unibyte buffer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* doc.c (Fsubstitute_command_keys): Ignore remappings unless there
+	are no ordinary bindings.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (syms_of_xfns): Defsubr x-file-dialog for GTK also.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow.
+	(x_lower_frame): Add BLOCK_INPUT around SendBehind.
+	(make_mac_frame): Add BLOCK_INPUT around the making of a
+	terminal frame.
+	(mac_initialize): Add BLOCK_INPUT around carbon initialization.
+	* macgui.h (mktime): Use emacs_mktime.
+	* macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code.
+	Make a cancel file-open dialog be like C-g.
+	* mac.c (mktime): Use emacs_mktime.
+	(Fdo_applescript): Add BLOCK_INPUT around do_applescript.
+	(Fmac_paste_function): Add better error handling for carbon cut/paste.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (timer_resume_idle): New function to resume idle
+	timer without resetting timers on the idle list.
+	(read_char): Use timer_resume_idle.  Remove local var last_idle_start.
+	(timer_start_idle, timer_stop_idle): Declare static.
+	(read_key_sequence): Use timer_resume_idle instead of timer_start_idle.
+
+	* keyboard.h (timer_start_idle, timer_stop_idle): Remove prototypes.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* config.in (HAVE_MALLOC_MALLOC_H): Regenerate.
+	* macterm.c (mac_check_for_quit_char): Remove warning for using
+	NULL where 0 should be used.
+	* unexmacosx.c: Use malloc/malloc.h on Tiger instead of
+	objc/malloc.h
+	* mac.c: Include time.h for Tiger compatibility.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_window): Fix flicker on vertical line between
+	windows.  Update vertical line after drawing window fringes, but
+	only if actually drawing any bitmaps--or there is no fringe.
+
+	* xterm.c (x_update_window_end): Likewise.
+	* macterm.c (x_update_window_end): Likewise.
+	* w32term.c (x_update_window_end): Likewise.
+
+	* fringe.c (draw_window_fringes): Return value now indicates if
+	any fringe bitmaps were redrawn (or there are no fringes).
+
+	* dispextern.h (draw_window_fringes): Update prototype.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (mac_get_window_bounds): Add extern.
+	(x_real_positions): Use mac_get_window_bounds.
+
+	* macmenu.c (update_submenu_strings): Apply 2004-09-07 change for
+	xmenu.c (YAILOM).
+
+	* macterm.c [!MAC_OSX]: Include Windows.h.
+	(front_emacs_window): Rename from mac_front_window.  All uses
+	changed.  Return the frontmost non-tooltip emacs window.
+	(mac_get_window_bounds): New function.
+	(x_calc_absolute_position): Use the difference of width and height
+	between the inner and outer window.
+	(x_set_offset): Specify window position by the coordinae of the
+	outer window.  Adjust the position if the title bar is completely
+	outside the screen.
+	(app_is_suspended, app_sleep_time): Remove unused variables.
+	(do_app_resume, do_app_suspend): Remove their contents because
+	window-activate/deactivate events will do the job.
+	(do_zoom_window): Remove unused variables.  Make compliant to the
+	standard way of zooming.  Set f->left_pos and f->top_pos.
+	(XTread_socket): Don't use argument `expected'.  Don't use
+	FrontWindow to determine the clicked window.  Exclude unprocessed
+	mouseUp cases in the early stage.  Add parentheses to fix operator
+	precedence.
+	(XTread_socket) [TARGET_API_MAC_CARBON]: Don't specify drag area.
+
[phone]  Jan Dj,Ad(Brv.  <[e-mail]>
+
+	* config.in: Regenerate.
+
+	* Makefile.in (RUN_TEMACS): Check HAVE_RANDOM_HEAPSTART instead of
+	HAVE_EXECSHIELD.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_find_modifier_meanings): Ignore any Super or Hyper for
+	a row if Alt or Meta has been found for that row.  Also stop scanning
+	for Keysyms for that row.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (Ffringe_bitmaps_at_pos): Change return value from cons
+	to list.  Include overlay arrow bitmap in return value.
+
+	* xterm.c (XTset_vertical_scroll_bar): Improve handling of scroll
+	bars with fractional column width.  If scroll bar separates two
+	windows, move it towards the window it belongs to.  Only update
+	the padding area below the scroll bar widget when necessary,
+	i.e. when scroll bar widget is created, moved, or resized.
+
+	* xdisp.c (define_frame_cursor1): Do not change frame cursor
+	while tracking/dragging mouse.
+	(x_draw_vertical_border): Do not draw line if frame has scroll bars.
+
+	* window.c (coordinates_in_window): Relax check for cursor
+	on vertial border between mode lines.
+	(Fset_window_fringes): Do not allow negative widths.
+	(Fset_window_scroll_bars): Likewise.
+
+	* .gdbinit (pp): Shorthand for p ARG + pr.
+	(ff): New command: flush frame updates (X only).
+
[phone]  Michael Albinus  <[e-mail]>
+
+	* fileio.c (auto_save_1) Call Ffile_modes for remote files.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* process.c (send_process): Free composition data.
+
+	* fileio.c (Finsert_file_contents): Free composition data.
+
+	* coding.c (code_convert_region): Don't skip ASCIIs if there are
+	compositions to encode.
+	(encode_coding_string): Likewise.  Free composition data.
+
[phone]  Florian Weimer  <[e-mail]>
+
+	* coding.c (code_convert_region): Free composition data.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c: Remove limit on number of bitmaps.
+	(fringe_bitmaps, fringe_faces): Change to pointers.
+	(max_fringe_bitmaps): New var.
+	(Fdefine_fringe_bitmap): Expand fringe_bitmaps and fringe_faces.
+	(init_fringe): Allocate fringe_bitmaps and fringe_faces.
+
+	* dispextern.h (FRINGE_ID_BITS): Increase to 16 bits (64K bitmaps).
+	(struct glyph_row): Reorder fringe_bitmap related fields.
+	(struct it): Likewise.
+
+	* w32term.c (fringe_bmp): Change to pointer.
+	(max_fringe_bmp): New var.
+	(w32_define_fringe_bitmap): Expand fringe_bmp.
+	(w32_draw_fringe_bitmap): Check max_fringe_bmp.
+	(w32_destroy_fringe_bitmap): Likewise.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c: Simplify last change.
+	(lookup_fringe_bitmap): New function.
+	(valid_fringe_bitmap_p, resolve_fringe_bitmap): Remove.
+	(Fdestroy_fringe_bitmap): Use lookup_fringe_bitmap.
+	Keep standard bitmaps in Vfringe_bitmaps.
+	(Fdefine_fringe_bitmap): Use lookup_fringe_bitmap.
+	(Fset_fringe_bitmap_face): Likewise.
+
+	* dispextern.h (lookup_fringe_bitmap): Add prototype.
+	(valid_fringe_bitmap_p): Remove prototype.
+
+	* xdisp.c (handle_single_display_prop): Use lookup_fringe_bitmap.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
+	(w32_init_fringe, w32_reset_fringes): Fix bootstrap (NULL rif).
+
+	* dispextern.h (valid_fringe_bitmap_p): Fix prototype.
+
+	* fringe.c (Vfringe_bitmaps): New variable.
+	(syms_of_fringe): DEFVAR_LISP it.
+	(valid_fringe_bitmap_p): Rename from valid_fringe_bitmap_id_p.
+	Change arg to Lisp_Object and fail if not an integer.
+	(get_fringe_bitmap_name, resolve_fringe_bitmap)
+	(destroy_fringe_bitmap): New functions.
+	(Fdestroy_fringe_bitmap): Change arg to bitmap symbol.
+	Use destroy_fringe_bitmap.  Remove symbol from Vfringe_bitmaps and
+	clear its fringe property.
+	(init_fringe_bitmap): Use destroy_fringe_bitmap instead of
+	Fdestroy_fringe_bitmap.
+	(Fdefine_fringe_bitmap): Add BITMAP arg specifying new or existing
+	bitmap symbol; remove WHICH arg.  Add symbol to Vfringe_bitmaps
+	and set fringe property.  Signal error if no free slots.
+	(Fset_fringe_bitmap_face): Change arg to bitmap symbol.
+	(Ffringe_bitmaps_at_pos): Return bitmap symbols instead of numbers.
+
+	* xdisp.c (handle_single_display_prop): Fringe bitmaps are now
+	symbols with a fringe property.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <indicate-buffer-boundaries>:
+	Doc fix.  Format may now be a symbol or alist, not a cons.
+
+	* fringe.c (update_window_fringes): Handle new formats of
+	indicate-buffer-boundaries (symbol or alist).  No longer
+	allow a simple cons.
+	(Ffringe_bitmaps_at_pos): Use nil value for no bitmap.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* config.in: Rebuild.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* config.in: Rebuild.
+
+	* Makefile.in: Run setarch i386 ./temacs if exec-shield  is present.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (x_term_init): Work around a bug in some X servers.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <default-major-mode>: Doc fix.
+
+	* xdisp.c (try_window_reusing_current_matrix):
+	Handle the case where we reach the old displayed text,
+	out of sync with the old line boundary.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents): Fix case of replacement in a
+	narrowed buffer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* puresize.h (PURESIZE_RATIO): Define based on BITS_PER_EMACS_INT.
+
+	* xfaces.c (Qface_no_inherit): New var.
+	(syms_of_xfaces): Intern and staticpro it.
+	(Finternal_make_lisp_face, Finternal_set_lisp_face_attribute)
+	(Finternal_copy_lisp_face, update_face_from_frame_parameter):
+	Don't increment face_change_count when face has non-nil
+	face-no-inherit property.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* bytecode.c (BYTE_CODE_QUIT): Add missing AFTER_POTENTIAL_GC.
+	(Fbyte_code): Remove dead code after `wrong_type_argument'.
+
+	* alloc.c (Fgarbage_collect): Mark keyboards, gtk data, and specpdl
+	before doing the mark_stack_check_gcpros since they're not on the stack.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Fformat): Handle format strings with multiple text
+	properties.  Reverse text property list from the format string,
+	so the positions are in increasing order.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xselect.c (x_reply_selection_request): XSync and UNBLOCK before
+	x_uncatch_errors so that possible protocol errors are delivered.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (msdos.o): Depend on buffer.h, commands.h, and
+	blockinput.h.
+	(dosfns.o): Depend on blockinput.h, window.h, dispextern.h,
+	charset.h, and coding.h
+	(w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h.
+	(term.o): Depend on window.h and keymap.h.
+	(abbrev.o): Depend on syntax.h.
+	(callint.o): Depend on keymap.h.
+	(casefiddle.o): Depend on charset.h and keymap.h.
+	(category.o): Depend on keymap.h.
+	(coding.o): Depend on dispextern.h.
+	(cmds.o): Depend on keyboard.h and keymap.h.
+	(dispnew.o): Depend on indent.h and intervals.h.
+	(doc.o): Depend on keymap.h.
+	(editfns.o): Depend on frame.h.
+	(emacs.o): Depend on dispextern.h.
+	(fileio.o): Don't depend on ccl.h.
+	(filelock.o): Depend on charset.h and coding.h.
+	(frame.o): Depend on w32term.h and macterm.h.
+	(insdel.o): Depend on region-cache.h.
+	(keyboard.o): Depend on keymap.h, w32term.h, and macterm.h.
+	(minibuf.o): Depend on $(INTERVALS_SRC) and keymap.h.
+	(search.o): Depend on $(INTERVALS_SRC).
+	(syntax.o): Depend on keymap.h, regex.h, and $(INTERVALS_SRC).
+	(window.o): Depend on keymap.h, blockinput.h, $(INTERVALS_SRC),
+	xterm.h, w32term.h, and macterm.h.
+	(xdisp.o): Depend on keyboard.h, $(INTERVALS_SRC), xterm.h,
+	w32term.h, and macterm.h.
+	(xfaces.o): Depend on keyboard.h, $(INTERVALS_SRC),
+	region-cache.h, xterm.h, w32term.h, and macterm.h.
+	(bytecode.o): Depend on dispextern.h, frame.h, and xterm.h.
+	(data.o): Depend on frame.h.
+	(fns.o): Depend on keymap.h, xterm.h, and blockinput.h.
+	(print.o): Depend on termchar.h and $(INTERVALS_SRC).
+	(lread.o): Depend on $(INTERVALS_SRC), termhooks.h, and coding.h.
+	(intervals.o): Depend on keymap.h.
+
+	* msdos.c (msdos_set_cursor_shape, IT_display_cursor):
+	Add debugging print-out to termscript.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (decode_mode_spec): Use current buffer for most purposes.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fset_window_buffer): Doc fix.
+
+	* xdisp.c (Fformat_mode_line): New arg BUFFER says which buffer to use.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	* minibuf.c (history_delete_duplicates): New variable.
+	(read_minibuf): Use it.
+	(syms_of_minibuf): Create the corresponding lisp variable.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (set_cursor_from_row): Also look at 'cursor' property in
+	overlay just before point.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.h (struct buffer): Add auto_save_file_format field.
+	* buffer.c (reset_buffer, init_buffer_once):
+	Handle auto_save_file_format field.
+	(syms_of_buffer): Add DEFVAR_PER_BUFFER for
+	`buffer-auto-save-file-format'.
+	* fileio.c: Delete declaration for removed Vauto_save_file_format.
+	(build_annotations): Adapt to replacement of
+	`auto-save-file-format' with the new buffer-local variable
+	`buffer-auto-save-file-format'.
+	(syms_of_fileio): Delete DEFVAR_LISP for auto-save-file-format.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
+
+	* w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]:
+	Handle Unicode menu titles.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (set_cursor_from_row): Fix last change.  Only use 'cursor'
+	property from text property or overlay strings at point.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xmenu.c (update_submenu_strings): YAILOM.
+	(set_frame_menubar): Make sure last_i is initialized.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (_widget_value): Add lname and lkey.
+	(digest_single_submenu): Set lname and lkey in widget_value
+	instead of name and key.
+	(update_submenu_strings): New function.
+	(set_frame_menubar): Remove call to inhibit_garbage_collection,
+	call update_submenu_strings.
+
+	* w32menu.c (globals_of_w32menu): Check for Unicode API.
+	(digest_single_submenu, w32_menu_show): Encode menu strings as
+	UTF-8 if Unicode API is available.
+	(utf8to16): New function.
+	(add_menu_item): Use it when calling Unicode API.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (set_cursor_from_row): Look for non-nil `cursor' property
+	in overlay or text-property strings; set cursor on corresponding
+	glyph rather than at end of the string.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c (x_real_positions): Save the current window port and
+	set a new one before obtaining the global coordinate.
+	Use FRAME_MAC_WINDOW.
+	(x_set_name, x_set_title): Encode title to UTF8.
+	Use SetWindowTitleWithCFString.
+	(Fx_server_version): Get correct OS version.
+
+	* macmenu.c (add_menu_item): Remove unused variable `i'.
+	Don't let separator items destroy refence constants of other menu items.
+
+	* macterm.c (x_update_end): Move SetPortWindowPort to inside
+	BLOCK_INPUT.
+	(x_set_offset): Use FRAME_MAC_WINDOW.
+
+	* xdisp.c (note_mouse_highlight): Set the mouse pointer shape to
+	nontext_cursor if it is on a scroll bar.
+
+	* s/darwin.h (LIBS_CARBON): New define to specify libraries for
+	Carbon support.
+	(LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.
+	Use LIBS_CARBON.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (x_set_name_internal): New function.  Check if we shall call
+	xfree before ENCODE_UTF_8.
+	(x_set_name, x_set_title): Call x_set_name_internal.
+
[phone]  NAKAMURA Toshikazu  <[e-mail]>  (tiny change)
+
+	* w32fns.c (w32_load_font): If a BDF font is already loaded, do not
+	reload it.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* macmenu.c (_widget_value): Add lname and lkey.
+	(single_submenu): Set lname and lkey in widget_value
+	instead of name and key.
+	(update_submenu_strings): New function.
+	(set_frame_menubar): Remove call to inhibit_garbage_collection,
+	call update_submenu_strings.
+
+	* xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
+	instead of name and key.
+	(update_submenu_strings): New function.
+	(set_frame_menubar): Remove call to inhibit_garbage_collection,
+	call update_submenu_strings.
+
+	* gtkutil.h (_widget_value): Added lname and lkey.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macmenu.c (mac_menu_show): Remove shadowing of menu variable
+	by using different names for inner loop variables.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
+	from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used.
+
+	* gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
+	tool bar items is 0.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte
+	strings in menu items.
+	(single_submenu): Use ENCODE_MENU_STRING
+	(mac_menu_show): Use ENCODE_MENU_STRING.  Reset grabbed because
+	button release isn't passed to event loop
+	(add_menu_item): Use SetMenuItemWithCFString
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* fileio.c (Fread_file_name): Call x_file_dialog on carbon on
+	tool-bar/menu click.
+	* macfns.c (Fx_file_dialog): Implement using NavServices.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
+
+	* xfns.c (x_window_to_frame, x_any_window_to_frame)
+	(x_non_menubar_window_to_frame, x_menubar_window_to_frame)
+	(x_top_window_to_frame): Return 0 if wdesc is None.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* process.c (process_send_signal) [SIGNALS_VIA_CHARACTERS,
+	HAVE_TERMIOS]: If there's no char for this signal, drop through
+	and use system calls.
+
+	* bytecode.c (Fbyte_code) <unwind-protect>: Cannot GC.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (wait_reading_process_output): Rename from
+	wait_reading_process_input.  All uses changed.
+	(wait_reading_process_output_1): Rename from
+	wait_reading_process_input_1.  All uses changed.
+
+	* dispnew.c (Fsleep_for): Remove obsolete code.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* syntax.c (skip_chars): Fix for unibyte case.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (char_quoted): Mixup byte/char pos.
+	(back_comment): Fixup globals in all cases.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (x_set_name, x_set_title): Encode title to UTF8 before
+	passing it to gtk_window_set_title.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (wait_reading_process_input): Clean up.
+	Add wait_for_cell, wait_proc, and just_wait_proc args
+	to avoid overloading `read_kbd' and `do_display' args.
+	Change read_kbd arg to int.  All callers changed.
+
+	* process.c (process_send_signal): Use CDISABLE.
+
+	* sysdep.c (child_setup_tty, init_sys_modes): Use CDISABLE.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Faccept_process_output): Add arg JUST-THIS-ONE;
+	forward to wait_reading_process_input via DO_DISPLAY arg.
+	(wait_reading_process_input): If DO_DISPLAY < 0 for a process
+	object, only process output from that process; also inhibit
+	running timers if DO_DISPLAY==-2.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (process_send_signal): Fix last change--use
+	_POSIX_VDISABLE instead of CVDISABLE when available.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* sysdep.c (child_setup_tty) [SIGNALS_VIA_CHARACTERS]:
+	Set VQUIT and VINTR chars to the standard ones if they are unset.
+	[AIX]: Don't do that here.  And don't force VINTR to standard
+	when SIGNALS_VIA_CHARACTERS.
+
+	* process.c (process_send_signal)
+	[SIGNALS_VIA_CHARACTERS, HAVE_TERMIOS]:	Clean up.
+	Do nothing if the character is CVDISABLE.
+
+	* xfaces.c (merge_face_ref): Specifying `unspecified' is a no-op.
+
+	* intervals.c (move_if_not_intangible):
+	Force POSITION to be between BEGV and ZV.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* buffer.c (Frestore_buffer_modified_p): Doc fix.
+
+	* fileio.c (Fread_file_name): Doc fix.
+
+	* minibuf.c (syms_of_minibuf) <completion-ignore-case>: Doc fix.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keymap.c (Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keyboard.c: Declare Qdisabled_command_function instead of
+	Qdisabled_command_hook.
+	(Fcommand_execute): Use Qdisabled_command_function instead of
+	Qdisabled_command_hook.
+	(syms_of_keyboard): Ditto.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keymap.c (Flocal_key_binding, Fglobal_key_binding)
+	(syms_of_keymap) <key-translation-map>: Doc fixes.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (window_list_1): YAILOM.
+
+	* fileio.c (make_temp_name): Handle multibyte prefixes.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:
+	Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (decode_coding_string): Adjust coding->consumed, and
+	etc. with shrinked_bytes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* indent.c (compute_motion): Fix check for full width window
+	in non-window case.  Do not count left truncation glyph on
+	window systems.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* data.c (Finteractive_form): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* indent.c (compute_motion): Use actual window width if WIDTH is -1,
+	properly accounting for continuation glyph on non-window systems.
+	(Fcompute_motion): Use actual window width if WIDTH is nil, and
+	actual window width/height if TOPOS is nil, properly accounting for
+	continuation glyphs on non-window systems, and optional header lines.
+	(vmotion): Let compute_motion calculate actual window width.
+
+	* window.c (window_scroll_line_based): Let compute_motion
+	calculate actual window width.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (read_process_output): Use whole read buffer.
+	Don't trigger adaptive read buffering on errors.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keymap.c (Fset_keymap_parent, Fdefine_prefix_command): Doc fixes.
+
+	* keyboard.c (syms_of_keyboard) <disable-point-adjustment>: Doc fix.
+
+	* callint.c (Fcall_interactively): Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* abbrev.c (Fexpand_abbrev): Undo previous change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Fformat): Allocate extra (dummy) element in info.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* eval.c (Fdefvar, Fdefconst): Doc fixes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_in_display_line_to): Check BUFFER_POS_REACHED_P after
+	we have ensured that the glyph fits on the current line (or returned
+	MOVE_LINE_CONTINUED otherwise).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_in_display_line_to): If overflow-newline-into-fringe
+	is enabled, return MOVE_LINE_CONTINUED rather than MOVE_POS_MATCH_OR_ZV
+	if target position is at end of display line but char is not a newline.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (coordinates_in_window): Return ON_SCROLL_BAR
+	instead of ON_VERTICAL_BORDER, when on scroll bar.
+	(Fcoordinates_in_window_p): Handle ON_SCROLL_BAR--return nil.
+
+	* dispextern.h (enum window_part): Add ON_SCROLL_BAR.
+
+	* window.c (Fcoordinates_in_window_p):
+	Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+	* alloc.c (check_cons_list): New function (contents commented out).
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* xfaces.c (Fcolor_supported_p): Doc fix.
+
+	* frame.c (Fselect_frame, Fset_frame_selected_window)
+	(Fframe_visible_p, Fraise_frame): Doc fixes.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.h (not_single_kboard_state): Declare.
+
+	* fileio.c (Fwrite_region): Doc fix.
+
+	* window.c (Fwindow_at): Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+	* abbrev.c (Fexpand_abbrev): Run Qpre_abbrev_expand_hook
+	only when a real abbrev is present.
+
+	* xfns.c (x_icon_verify): New function.
+	(Fx_create_frame): Use it.
+
[phone]  Barry Fishman  <[e-mail]>  (tiny change)
+
+	* s/gnu-linux.h: Use GC_MARK_STACK if __amd64__ is defined.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.h (struct glyph_matrix): New members nrows_scale_factor
+	and ncols_scale_factor.
+
+	* window.c (make_window): Initialize nrows_scale_factor and
+	ncols_scale_factor members.
+
+	* dispnew.c (margin_glyphs_to_reserve): Apply ncols_scale_factor.
+	(allocate_matrices_for_frame_redisplay): Fix left/right margin mix-up.
+	(required_matrix_height): Apply nrows_scale_factor.
+	(required_matrix_width): Apply ncols_scale_factor.
+
+	* xdisp.c (display_line): Increment nrows_scale_factor and set
+	fonts_changed_p if past last allocated row.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Increment ncols_scale_factor and set
+	fonts_changed_p if current area is full.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* widget.c (EmacsFrameDestroy): Don't abort if normal_gc is 0.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* window.c (Fpos_visible_in_window_p, Fset_window_hscroll)
+	(Fwindow_inside_pixel_edges, Fwindow_end, Fset_window_point)
+	(Fset_window_start, Fscroll_up, Fscroll_down)
+	(Fother_window_for_scrolling, Fscroll_other_window)
+	(Fsave_window_excursion, Fset_window_vscroll)
+	(syms_of_window) <window-size-fixed>: Doc fixes.
+
[phone]  KOBAYASHI Yasuhiro  <[e-mail]>
+
+	* w32fns.c (Fx_file_dialog): Use ENCODE_FILE instead of
+	ENCODE_SYSTEM for filenames.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (sys_select): Block input around call to
+	ReceiveNextEvent to prevent breakage.  Correctly handle
+	blocking on event queue only by calling ReceiveNextEvent
+	instead of select (since GUI events aren't on an fd).
+	(sys_read): Remove function
+	* sysdep.c: Remove redefine of read to sys_read if HAVE_CARBON
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* mac.c (sys_select): Redo sys_select to use alarm-based
+	polling instead of 1 sec timeouts (like solaris).
+
+	* macterm.c (x_make_frame_visible): Comment in polling on
+	frame creation.
+
+	* keyboard.c: Undef SIGIO on Carbon
+
+	* atimer.c (alarm_signal_handler): Call alarm handlers after
+	scheduling.
+
+	* eval.c (Feval): Remove quit_char test
+
+	* process.c (wait_reading_process_input): Remove clearing
+	stdin for select call on process input.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp) <window-scroll-functions>: Correct
+	capitalization error in docstring.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keyboard.c (not_single_kboard_state): Do nothing unless
+	MULTI_KBOARD is defined.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (coordinates_in_window): Inside the window but outside
+	its box to the L or R, return ON_VERTICAL_BORDER.
+	(window_list_1): Rotate the list to start with WINDOW.
+
+	* print.c (print_preprocess): Test for print_depth at limit
+	before entering in being_printed.
+
+	* keyboard.c (not_single_kboard_state): New function.
+	(stuff_buffered_input): Now no-op only if no SIGTSTP.
+
+	* frame.c (Fdelete_frame): If we're in single_bboard_state on
+	this kboard, and we delete its last frame, go to any_kboard_state.
+
+	* buffer.c (syms_of_buffer) <transient-mark-mode>: Doc fix.
+
[phone]  KOBAYASHI Yasuhiro  <[e-mail]>
+
+	* w32fns.c (Fx_file_dialog): Encode strings in system coding
+	system before passing them to OS functions for display.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* search.c (syms_of_search): Staticpro `saved_last_thing_searched'.
+	Apparently fixes an abort condition.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fileio.c (Fvisited_file_modtime): Return a list of two integers,
+	instead of a cons.
+
[phone]  K,Ba(Broly L,Bu(Brentey  <[e-mail]>
+
+	* keyboard.c (echo_dash): Do nothing if there already is a dash
+	at the end of the echo string.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (mark_object): Only look at Lisp_Misc_Save_Value
+	if GC_MARK_STACK.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
+
+	* window.c (Fwindow_buffer, Fother_window,  Fget_lru_window)
+	(Fget_largest_window, Fget_buffer_window, Fdelete_windows_on)
+	(Freplace_buffer_in_windows, Fset_window_buffer)
+	(Fselect-window, Fdisplay-buffer, Fsplit_window): Doc fixes.
+	(syms_of_window): Expand docstring of `display-buffer-function'.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* editfns.c (Ffloat_time, Fformat_time_string, Fdecode_time)
+	(Fcurrent_time_string, Fcurrent_time_zone): Mention in docstrings
+	that time values of the type (HIGH . LOW) are considered obsolete.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keyboard.c (syms_of_keyboard): Fix `keyboard-translate-table'
+	docstring.
+
+	* fns.c (Fclear_string): Declare `len' before call to CHECK_STRING.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* eval.c (Fdefmacro): Signal an error if NAME is not a symbol.
+
+	* fns.c (Fclear_string): Signal an error if STRING is not a string.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* macterm.c (mac_initialize_display_info): Use CGGetActiveDisplayList
+	instead of CGMainDisplayID (only in OSX 10.2 and later).
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* fileio.c (read_file_name_completion_ignore_case): New variable.
+	(syms_of_fileio): Declare and initialise it.
+	(Fread_file_name): Bind `completion-ignore-case' to respect it.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (dos_rawgetc): Use make_number to produce Lisp objects
+	for event.x and event.y.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* w32select.c (Fw32_set_clipboard_data): Update `nbytes' correctly
+	after getting a new string by pre-write-conversion.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (x_detect_focus_change): Remove unused var `nr_events'.
+	(x_calc_absolute_position): Remove unused var `child'.
+
+	* xfaces.c (x_supports_face_attributes_p)
+	(Fdisplay_supports_face_attributes_p): YAILOM.
+	(tty_supports_face_attributes_p): Remove unused var `i'.
+
+	* syntax.c (skip_chars): Remove unused labels fwd_unibyte_ok and
+	back_unibyte_ok.
+
+	* search.c (match_limit, Fmatch_data, Fset_match_data): YAILOM.
+
+	* fontset.c (Fset_fontset_font): Remove unused vars `family' and `registry'.
+
+	* Makefile.in (${etc}DOC): Fix file name of make-docfile.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* image.c (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
+	(Finit_image_library): Pass LIBRARIES through to
+	CHECK_LIB_AVAILABLE.  Declare parameters.  Doc fix.
+	(lookup_image_type): Pass Qnil as second argument to
+	Finit_image_library.
+
+	* lisp.h (Finit_image_library): Declare.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (do_window_activate, do_window_deactivate): Remove.
+	(XTread_socket): Send mouse button events to the toolbox
+	dispatcher even when the mouse is grabbed.  Don't process window
+	activate events for non-Emacs windows.	Replace function calls to
+	do_window_activate and do_window_deactivate with their contents.
+	Reset mouse grabbing status when a window is deactivated.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (mac_get_emulated_btn)
+	(mac_event_to_emacs_modifiers): Fix emulated mouse button
+	support to correctly mask out modifiers.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* search.c (Fset_match_data): Allow buffer before end of list
+	which can happen if set-match-data is using a pre-consed list.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (XTread_socket): Correctly set the frame position
+	after the window is moved.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
+	gpix and gmask just before return to avoid memory leak.
+	(xg_get_image_for_pixmap): Add workaround for monochrome displays
+	so insensitive and activated icons look ok.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (file_dialog_callback): Disable edit control if set
+	to directories only on CDN_INITDONE message.
+	(Fx_file_dialog): Default to directories only when prompt starts
+	with "Dired".
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (allocate_misc): Update total_free_markers.
+	(free_misc): New function.
+	(safe_alloca_unwind, free_marker): Use it.
+
+	* lisp.h (free_misc): Add prototype.
+
+	* fns.c (Fmapconcat, Fmapcar): Remove superfluous GCPROs.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* emacs.c (Vsignal_USR1_hook, Vsignal_USR2_hook): Definitions deleted.
+	(syms_of_emacs): Lisp variables deleted.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* search.c (Freplace_match): Adjust the match-data more thoroughly
+	when replacing strings in the buffer.
+	(Fmatch_data): When INTEGERS is non-nil and the last match was in
+	a buffer, add the buffer as last element to the match data.
+	(Fset_match_data): If an additional element of the match-data is a
+	buffer, restore it to last_thing_searched.
+	(save_search_regs): Save last_thing_searched as part of the match data.
+	(restore_match_data): Restore it again.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* keymap.c (Ftext_char_description): Doc fix.
+	* doc.c (Fsnarf_documentation): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fns.c (Fmapcar, Fmapconcat): GCPRO the args array.
+
+	* lisp.h (struct Lisp_Save_Value): New member dogc.
+	(SAFE_ALLOCA_LISP): Change second arg to number of elements.
+	Set dogc member in Lisp_Save_Value object so it will be GC'ed.
+	(SAFE_FREE_LISP): New macro.
+
+	* alloc.c (safe_alloca_unwind): Clear dogc and pointer members.
+	(make_save_value): Init new dogc member.
+	(mark_object): Mark Lisp_Save_Value pointer array if dogc is set.
+
+	* fns.c (Fmapconcat, Fmapcar): Use new SAFE_ALLOCA_LISP and
+	SAFE_FREE_LISP macros.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lisp.h (SAFE_ALLOCA_LISP): New macro to allocate Lisp_Objects.
+	Temporarily inhibits GC if memory is xmalloc'ed, as the Lisp_Objects
+	in that memory area are unknown to GC.  Add comments.
+
+	* fns.c (Fmapconcat, Fmapcar): Use SAFE_ALLOCA_LISP.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lisp.h (MAX_ALLOCA): Define here.
+	(safe_alloca_unwind): Add prototype.
+	(USE_SAFE_ALLOCA, SAFE_ALLOCA, SAFE_FREE): New macros.
+
+	* alloc.c (safe_alloca_unwind): New function.
+
+	* casefiddle.c (casify_object): Use SAFE_ALLOCA.
+
+	* charset.c (Fstring): Use SAFE_ALLOCA.
+
+	* coding.c (MAX_ALLOCA): Remove define.
+
+	* data.c (MAX_ALLOCA): Remove define.
+	(Faset): Use SAFE_ALLOCA.
+
+	* editfns.c (Fformat, Ftranspose_regions): Use SAFE_ALLOCA.
+
+	* fns.c (string_make_multibyte, string_to_multibyte)
+	(string_make_unibyte, Fmapconcat, Fmapcar): Use SAFE_ALLOCA.
+	(MAX_ALLOCA): Remove define.
+	(Fbase64_encode_region, Fbase64_encode_string)
+	(Fbase64_decode_region, Fbase64_decode_string): Use SAFE_ALLOCA.
+	(Fbase64_encode_region, Fbase64_encode_string): Fix potential
+	memory leak if encoding fails.
+
+	* xdisp.c (add_to_log): Use SAFE_ALLOCA.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* print.c (Fwith_output_to_temp_buffer): Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfaces.c (Finternal_copy_lisp_face): Small cleanup; doc fix.
+
+	* search.c (match_limit): Cleaner err msg when no match data available.
+
+	* window.c (syms_of_window): Doc fix.
+
+	* keyboard.c (command_loop_1): Handle values `only' and `identity'
+	for Vtransient_mark_mode.
+
+	* buffer.c (syms_of_buffer): Doc fix.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* minibuf.c (Ftry_completion, Fall_completions): Do lazy binding
+	and unbinding of `case-fold-search' according to
+	`completion-ignore-case' around calls of string-match and
+	predicates, respectively.  Should give satisfactory performance
+	in all relevant cases.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_draw_image_foreground_1): Subtract slice.x/y from
+	clip_x/y_origin.
+
+	* fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.
+
+	* macfns.c (Fx_display_color_cells): Do not limit return value to 256.
+
+	* macterm.c (mac_initialize_display_info): Initialize n_planes correctly
+	on Mac OSX.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Clarify `fill-column' docstring.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (Vimage_types): Remove extern.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* image.c (lookup_image_type): Initialize image type if necessary.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (try_cursor_movement): Exclude header line from scroll
+	margin at top of window.
+	(try_window_reusing_current_matrix): Calculate proper cursor position
+	after scrolling up with non-zero scroll margin, as the old cursor
+	position corresponds to value of PT before executing this command.
+	(try_window_id): Consider scroll margin at bottom of window too;
+	otherwise we fail to scroll when hl-line-mode is enabled.
+
+	* syntax.c (skip_chars): Only recognize [:class:] when it has the
+	proper format and class is a lower-case word.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_get_image_for_pixmap): New function.
+	(xg_get_gdk_pixmap_and_mask): Remove.
+	(update_frame_tool_bar): Call xg_get_image_for_pixmap instead of
+	xg_get_gdk_pixmap_and_mask.
+
+	* xterm.h (struct x_display_info): Typo in comment fixed.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* dispextern.h (Vimage_types): Make it conditional on
+	HAVE_WINDOW_SYSTEM.
+
+	* image.c (Vimage_types): Move from xdisp.c.
+	(Vimage_type_cache): New variable.
+	(define_image_type): New argument indicating whether an image
+	library was loaded; cache loaded status and return t on success,
+	nil otherwise.
+	(CACHE_IMAGE_TYPE, ADD_IMAGE_TYPE): New macros.
+	(w32_delayed_load): New function to load an image library from a
+	list of possible filenames.
+	(init_xpm_functions, init_png_functions, init_jpeg_functions)
+	(init_tiff_functions, init_gif_functions): Use `w32_delayed_load'.
+	(CHECK_LIB_AVAILABLE): Call `define_image_library' with new argument.
+	(Finit_image_library): New function, extracted from `init_image'.
+	Try to initialize an image library on demand and cache whether we
+	were successful or not.
+	(syms_of_image): Initialize `Vimage_types' and
+	`Vimage_type_cache'.  Add recognized image types to Vimage_types.
+	Export `init-image-library'.
+	(init_image): Remove initialization of all image types, except xbm
+	and pbm.
+
+	* xdisp.c (Vimage_types): Delete (moved to image.c).
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
+	Avoid calling specbind when completion-regexp-list is empty.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.h (CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
+	(re_wctype, re_iswctype, re_wctype_to_bit):
+	Non-function definitions moved here from regex.c.
+
+	* regex.c (re_wctype, re_iswctype): Function defs longer static.
+	(CHAR_CLASS_MAX_LENGTH, re_wctype_t, re_wchar_t)
+	(re_wctype, re_iswctype, re_wctype_to_bit):
+	Non-function definitions moved to regex.h.
+
+	* window.c (Fselect_window): Doc fix.
+
+	* syntax.c: Include regex.h.
+	(skip_chars): New arg HANDLE_ISO_CLASSES.  Callers changed.
+	If requested, make a list of classes, then check the scanned
+	chars for membership in them.
+	(in_classes): New function.
+	Doc fix.
+
+	* keyboard.c (cmd_error): Don't call any_kboard_state
+	if inside a recursive edit level.
+
[phone]  K,Ba(Broly L,Bu(Brentey  <[e-mail]>
+
+	* keyboard.c (command_loop): Call any_kboard_state before
+	command_loop_2 when at top level.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* print.c (print_object): Always use %ld for printing EMACS_INT.
+
+	* keyboard.c (cancel_hourglass_unwind): Return a value.
+	(modify_event_symbol): Always use %ld for printing EMACS_INT.
+	(Fexecute_extended_command): Likewise.
+
+	* syntax.h (SYNTAX_ENTRY_FOLLOW_PARENT): Rename local variable to
+	avoid clashes.
+	(SYNTAX): Likewise.
+	(SYNTAX_WITH_FLAGS): Likewise.
+	(SYNTAX_MATCH): Likewise.
+
+	* syntax.c (char_quoted): Avoid warning about undefined operation.
+	(find_defun_start): Likewise.
+	(scan_lists): Likewise.
+	(INC_FROM): Likewise.
+	(scan_sexps_forward): Likewise.
+
+	* image.c: Include <ctype.h>.
+
+	* xfaces.c (face_attr_equal_p): Declare parameters.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* ccl.c (CCL_READ_CHAR): If hit EOF, set REG to -1.
+
[phone]  Matthew Mundell  <[e-mail]>
+
+	* eval.c (Fdefun): Signal an error if NAME is not a symbol.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Save eof_ic in
+	ccl_prog_stack_struct and update it.
+	(CCL_INVALID_CMD): If CCL_DEBUG is defined, call ccl_debug_hook.
+	(CCL_READ_CHAR): Get instruction counter from eof_ic, not from
+	ccl->eof_ic on EOF.
+	(ccl_debug_hook): New function.
+	(struct ccl_prog_stack): New member eof_ic.
+	(ccl_driver): Handle EOF in subrountine call correctly.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (encode_coding_string): Check CODING_FINISH_INTERRUPT.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* emacs.c (shut_down_emacs): Inhibit redisplay during shutdown.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keyboard.c (Fposn_at_point): Doc fix.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* search.c (match_limit): Don't flag an error if match-data
+	exceeding the allocated search_regs.num_regs gets requested, just
+	return Qnil.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (push_named_merge_point): Return 0 when a cycle is detected.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* editfns.c (Fuser_login_name, Ffloat_time, Fencode_time)
+	(Fcurrent_time_string, Fcurrent_time_zone)
+	(Finsert_buffer_substring, Ftranspose_regions): Doc fixes.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (struct named_merge_point): New type.
+	(push_named_merge_point): New function.
+	(merge_named_face): New function.
+	(merge_face_ref, face_at_buffer_position, face_at_string_position):
+	Use `merge_named_face'.
+	(merge_face_inheritance): Function removed.
+	(merge_face_ref): Rename from `merge_face_vector_with_property'.
+	Add new `err_msgs' and `named_merge_points' args.  Return error
+	status.  Only print error messages if ERR_MSGS is true.  Don't try to
+	do :inherit attribute validation.
+	(merge_face_heights): Handle `unspecified' in both directions.
+	(merge_face_vectors): Rename `cycle_check' arg to `named_merge_points'.
+	Call `merge_face_ref' instead of `merge_face_inheritance'.
+	(Fdisplay_supports_face_attributes_p, Fface_attributes_as_vector)
+	(compute_char_face, face_at_buffer_position)
+	(face_at_string_position): Call `merge_face_ref' instead of
+	`merge_face_vector_with_property'.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (find_safe_codings): Check NILP (safe_codings) only at
+	the necessary places.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fdelete_process): Undo 2004-05-28 change.
+	Instead, call status_notify also for network process.
+	(status_message): Use process instead of status as arg.
+	Give messages "deleted" or "connection broken by remote peer" for
+	an exited network process.
+	(status_notify): Change call to status_message.
+	(read_process_output): Increase readmax to 4096.  Do not increase
+	buffer size for datagram channels (default is now large enough).
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macfns.c (x_create_tip_frame): Fix Mac OS X 10.1 compilation
+	problem due to newly defined variable.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (Fdisplay_supports_face_attributes_p): Give up
+	immediately if non-interactive or not initialized.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (Fcompleting_read): Doc fix.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* macfns.c (x_create_tip_frame): Fix declaration after statement.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keymap.c (Fdescribe_vector): Fix docstring.
+	(Fkey_description, Fglobal_key_binding): Fix typo in docstring.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (tty_supports_face_attributes_p): Make sure the specified
+	attributes have different values than the default face.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xfaces.c (x_supports_face_attributes_p): Make this function
+	conditional on HAVE_WINDOW_SYSTEM.
+	(Fdisplay_supports_face_attributes_p) [HAVE_WINDOW_SYSTEM]:
+	Don't call x_supports_face_attributes_p if it was not compiled in.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (tty_supports_face_attributes_p): New function, mostly
+	from Ftty_supports_face_attributes_p.
+	(x_supports_face_attributes_p): New function.
+	(Ftty_supports_face_attributes_p): Function deleted.
+	(Fdisplay_supports_face_attributes_p): New function.
+	(syms_of_xfaces): Initialize Sdisplay_supports_face_attributes_p.
+	(face_attr_equal_p): New function.
+	(lface_equal_p): Use it.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* w32fns.c (Fx_display_grayscale_p, Fw32_send_sys_command)
+	(Vw32_color_map): 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.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	Work around bugs/problems with MinGW builds of graphics libraries
+	called from MSVC builds of Emacs.
+
+	* image.c (lookup_image): Make pointer to img static.
+	(png_read_from_memory): Disable "global" optimization.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Fcondition_case): Fix usage.  Simplify.
+
+	* mem-limits.h (EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macfns.c: Don't include ccl.h.
+	[MAC_OSX]: Don't include QuickTime/QuickTime.h.
+	[!MAC_OSX]: Don't include alloca.h, Windows.h, Gestalt.h, or
+	TextUtils.h.
+	(Fx_create_frame): Sync with xfns.c.  Initialize cursor descriptors.
+	(Fx_display_mm_height, Fx_display_mm_width): Calculate length from
+	display height/width.
+	(compute_tip_xy, Vx_max_tooltip_size): Declare.
+	(unwind_create_tip_frame, compute_tip_xy): New functions.
+	(x_create_tip_frame, Fx_show_tip, Fx_hide_tip): Sync with xfns.c.
+	(syms_of_macfns): Initialize Qcancel_timer, Vx_max_tooltip_size,
+	and last_show_tip_args.
+
+	* macgui.h [!MAC_OSX]: Include Gestalt.h.
+	(Cursor, No_Cursor): New defines.
+	[!TARGET_API_MAC_CARBON] (SetPortWindowPort): New compatibility macro.
+	[!TARGET_API_MAC_CARBON] (arrow_cursor): Declare.
+
+	* macmenu.c (mac_menu_show, mac_dialog): Use SetPortWindowPort.
+
+	* macterm.c: Don't include Gestalt.h.
+	(enum mouse_tracking_type, mouse_tracking_in_progress): Remove.
+	(XDrawLine, XClearArea, XClearWindow, mac_draw_bitmap)
+	(mac_set_clip_rectangle, mac_reset_clipping, XCreatePixmap)
+	(XFillRectangle, mac_draw_rectangle, mac_draw_string_common)
+	(mac_copy_area, mac_copy_area_with_mask, x_update_end)
+	(construct_mouse_click, XTmouse_position)
+	(x_scroll_bar_report_motion, x_calc_absolute_position)
+	(do_mouse_moved, do_zoom_window, mac_do_receive_drag)
+	(XTread_socket, make_mac_frame): Use SetPortWindowPort.
+	(note_mouse_movement): Clear the mouse face and reset the pointer
+	shape when the pointer goes outside the frame without grabbing.
+	(mac_front_window): New function.
+	(mac_window_to_frame): New macro.
+	(XTmouse_position, x_scroll_bar_report_motion, do_window_update)
+	(do_window_activate, do_window_deactivate, do_app_resume)
+	(do_app_suspend, do_mouse_moved, do_menu_choice, do_grow_window)
+	(do_zoom_window, mac_do_receive_drag, XTread_socket)
+	(mac_check_for_quit_char): Use mac_front_window and/or
+	mac_window_to_frame.
+	(x_scroll_bar_handle_click): Set `(PORTION . WHOLE)' part in a
+	scroll-bar click event.
+	(mac_define_frame_cursor): Change the pointer shape.
+	(x_free_frame_resources): Reset tip_window to NULL when it is
+	disposed of.
+	[!TARGET_API_MAC_CARBON] (arrow_cursor): New variable.
+	[!TARGET_API_MAC_CARBON] (do_init_managers): Initialize arrow_cursor.
+	(do_window_update): Don't do anything if the updated window is the
+	tooltip window.
+	(do_mouse_moved): Handle mouse movement events here (previously in
+	XTread_socket).  Clear the mouse face if
+	dpyinfo->mouse_face_hidden is set.
+	(do_os_event, do_events): Remove (now in XTread_socket).
+	(XTread_socket): Immediately return if interrupt_input_blocked.
+	Loop until all the events in the queue are processed.
+	Rearrange codes for mouse grabbing.  Add tooltip support.  Include the
+	contents of do_os_event and do_events.  Remove mouse movement
+	handling (now in do_mouse_moved).  Add the case where
+	Vmouse_highlight has an integer value.
+	(NewMacWindow): Remove.
+	(make_mac_frame): Do what NewMacWindow previously did.  Don't do
+	excess initializations.
+	(make_mac_terminal_frame): Previous initializations in
+	make_mac_frame are moved here.
+	(mac_initialize_display_info):
+	Initialize dpyinfo->mouse_face_overlay and dpyinfo->mouse_face_hidden.
+
+	* xdisp.c [MAC_OS] (No_Cursor): Remove variable.
+	(define_frame_cursor1): Don't treat HAVE_CARBON as a special case.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lisp.h (truncate_undo_list): Update decl.
+
+	* alloc.c (undo_outer_limit): New variable.
+	(syms_of_alloc): Defvar it.
+	(Fgarbage_collect): Pass undo_outer_limit to truncate_undo_list.
+
+	* undo.c (truncate_undo_list): New arg LIMITSIZE.
+
+	* alloc.c (lisp_align_malloc): Check for base == 0
+	regardless of HAVE_POSIX_MEMALIGN.
+	Clean up HAVE_POSIX_MEMALIGN handling of `err'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c: Undo Kim's recent changes and fix the same bug differently.
+	(marker_blocks_pending_free): Remove.
+	(Fgarbage_collect): Sweep after cleaning up undo-lists.
+	Mark the undo lists after claning them up.
+	Don't free block in marker_blocks_pending_free.
+	(mark_buffer): Don't mark undo_list.
+	(gc_sweep): Sweep hash-tables and strings first.
+	Do free marker blocks that are empty.
+
[phone]  Jim Blandy  <[e-mail]>
+
+	* regex.c (print_partial_compiled_pattern): Add missing 'break'
+	after 'case wordend'.  For symbeg and symend, print to stderr,
+	like the other cases.
+
[phone]  Noah Friedman  <[e-mail]>
+
+	* process.c (Fdelete_process): Do not call remove_process.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (struct backtrace): Remove.
+	(Fgarbage_collect): Use the new mark_backtrace.
+
+	* eval.c (mark_backtrace): New function.
+
+	* minibuf.c (run_exit_minibuf_hook): New function.
+	(read_minibuf_unwind): Don't run exit-minibuffer-hook any more.
+	(read_minibuf): Use separate unwind handler to run exit-minibuf-hook.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (back_to_previous_visible_line_start): Skip backwards
+	over display properties, e.g. images, that replace buffer text.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (marker_blocks_pending_free): New var.
+	(gc_sweep): Store free marker blocks on that list.
+	(Fgarbage_collect): Free them after undo-list cleanup.
+
+	* process.c (wait_reading_process_input): Check connect_wait_mask
+	before actually accepting connection in case it has already been
+	accepted due to recursion.
+
[phone]  K,Ba(Broly L,Bu(Brentey  <[e-mail]>
+
+	* coding.c (Fset_safe_terminal_coding_system_internal):
+	Set suppress_error in safe_terminal_coding, not terminal_coding.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* alloc.c (Fmake_string): Doc fix.
+
+	* buffer.c (clone_per_buffer_values): Copy the alist of local vars,
+	and the alist pairs too.
+
+	* casefiddle.c (casify_object): Return OBJ unchanged if not real char.
+
+	* emacs.c (main): Update copyright year.
+
+	* fileio.c (Fread_file_name): Expand DIR if not absolute.
+
+	* insdel.c (del_range_2, replace_range): Don't write an anchor
+	if the gap is empty.
+
+	* xdisp.c (try_scrolling): If scroll-up-aggressively or
+	scroll-down-aggressively is small but positive, put point
+	near the screen edge.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keymap.c (Fdefine_key): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (struct backtrace): Add debug_on_exit member.
+	(Fgarbage_collect): Clear out buffer undo_list markers after gc_sweep.
+	Identify those markers as Lisp_Misc_Free objects.  Clear car and cdr of
+	the removed cons cells.
+	(mark_object): Undo previous change - disallow Lisp_Misc_Free objects.
+	(gc_sweep): Clear cons_blocks before sweeping strings, so we don't have
+	any cons cells pointing to unallocated stings.
+	Do not lisp_free any marker blocks, as there may still be pointers
+	to them from buffer undo lists at this stage of GC.
+
+	* keyboard.c (struct backtrace): Add debug_on_exit member.
+	(Fcommand_execute): Clear it.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* intervals.c (lookup_char_property): Do not prematurely return nil.
+
[phone]  Jim Blandy  <[e-mail]>
+
+	Add support for new '\_<' and '\_>' regexp operators, matching the
+	beginning and end of symbols.
+
+	* regex.c (enum syntaxcode): Add Ssymbol.
+	(init_syntax_once): Set the syntax for '_' to Ssymbol, not Sword.
+	(re_opcode_t): New opcodes `symbeg' and `symend'.
+	(print_partial_compiled_pattern): Print the new opcodes properly.
+	(regex_compile): Parse the new operators.
+	(analyse_first): Skip sym(beg|end) (they match only the empty string).
+	(mutually_exclusive_p): `symend' is mutually exclusive with \s_ and
+	\sw; `symbeg' is mutually exclusive with \S_ and \Sw.
+	(re_match_2_internal): Match symbeg and symend.
+
+	* search.c (trivial_regexp_p): \_ is no longer a trivial regexp.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* .gdbinit (xsymbol): Fix last change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* .gdbinit (xprintstr): New fun.
+	(xstring, xprintsym): Use it.
+
+	* w32proc.c (create_child): Use INTMASK.
+
+	* alloc.c (Fgarbage_collect): Do all the marking before flushing
+	unmarked elements of the undo list.
+
[phone]  David Ponce  <[e-mail]>
+
+	* print.c (print): Reset print_depth before to call print_object.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32console.c: Prefix RIF functions with w32con_ to avoid
+	namespace clash with functions in term.c and w32term.c.
+
+	* w32menu.c (add_menu_item, w32_menu_display_help)
+	[USE_LISP_UNION_TYPE]: Cast from Lisp_Object using i member.
+
+	* w32term.h (display_x_get_resource, vga_stdcolor_name): Add prototype.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* lisp.h (DECL_ALIGN): Remove restriction on MS-DOS systems.
+
+	* msdos.c (syms_of_msdos): Initialize dos-unsupported-char-glyph
+	with make_number.
+	(IT_write_glyphs): Extract glyph from dos-unsupported-char-glyph
+	with XINT.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* blockinput.h (INPUT_BLOCKED_P): New macros.
+
+	* keyboard.c (Frecursive_edit): Return immediately if input blocked.
+	(Ftop_level): Unblock input if blocked.
+
+	* buffer.h (GET_OVERLAYS_AT): New macro.
+	* msdos.c (IT_note_mouse_highlight): Use it.
+	* textprop.c (get_char_property_and_overlay): Use it.
+	* xdisp.c (next_overlay_change, note_mouse_highlight): Use it.
+	* xfaces.c (face_at_buffer_position): Use it.
+
+	* print.c (print_object): Increase buf size.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (Fw32_register_hot_key, Fw32_unregister_hot_key)
+	(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.
+
+	* w32proc.c (create_child): Use make_number instead of masking pid.
+
+	* w32fns.c (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.
+
+	* w32term.c (w32_num_mouse_buttons): Rename from
+	Vw32_num_mouse_buttons and make it an int.
+
+	* w32.c (init_environment): Use it.
+
+	* w32fns.c (w32_wnd_proc): Likewise.
+
+	* w32proc.c (w32_pipe_read_delay): Rename from
+	Vw32_pipe_read_delay and make it an int.
+
+	* w32.c (_sys_read_ahead): Use it.
+
+	* lisp.h (egetenv) [USE_CRT_DLL]: Remove condition.
+
+	* w32proc.c (create_child) [USE_LSB_TAG]: Don't try to mask pid.
+
+	* w32inevt.c (w32_console_mouse_position, do_mouse_event)
+	(key_event): Don't mix Lisp_Object and int.
+
+	* w32heap.c (init_heap) [USE_LSB_TAG]: Don't check heap location.
+
+	* keyboard.c (kbd_buffer_get_event): Don't use event->code and
+	modifiers in language change event.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* alloc.c (mark_object): Ignore Lisp_Misc_Free objects.
+	Such objects may be freed markers which still exist on an undo list.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* data.c (Fset_default): Make argument names match their use in
+	docstring.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* emacs.c (gdb_array_mark_flag): Define.
+	* .gdbinit: Mask off gdb_array_mark_flag from vector sizes.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* lisp.h (DECL_ALIGN) [MSDOS]: Don't define DECL_ALIGN to use
+	__attribute__((__aligned__)), so that USE_LSB_TAG would not become
+	defined for the MS-DOS build.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* w32fns.c (Fw32_define_rgb_color): Avoid XSET.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* ccl.c (Fccl_execute_on_string): Fix setting elements of STATUS.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* lisp.h (Vx_resource_name, Vx_resource_class): Move from xfns.c
+	section to frame.c section.
+	(Fxw_display_color_p, Fx_file_dialog): Declare if
+	HAVE_WINDOW_SYSTEM defined.
+
+	* macfns.c (Fx_create_frame): Fix int/Lisp_Object mixup.
+
+	* macmenu.c (set_frame_menubar): Use NILP to test a lisp value.
+
+	* macterm.c (mac_get_emulated_btn, mac_event_to_emacs_modifiers)
+	(mac_get_mouse_btn): Use NILP and EQ to test/compare lisp values.
+	(XTread_socket): Fix int/Lisp_Object mixup.
+	(mac_check_for_quit_char): Fix pointer/Lisp_Object mixup.
+
+	* macterm.h (struct frame, struct face, struct image)
+	(display_x_get_resource, Fx_display_color_p)
+	(Fx_display_grayscale_p, Fx_display_planes, x_free_gcs):
+	Add prototypes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (wait_reading_process_input): Make reentrant.
+	Make Available and Connecting non-static.  Save and restore value
+	of waiting_for_user_input_p.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (mark_kboards): Don't mark x and y members
+	that are overloaded in selection request events.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (USE_LSB_TAG): Make it the default when it is known to work.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* window.c (Fdisplay_buffer, Fsplit_window)
+	(split-height-threshold): Doc fix.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xfaces.c (Ftty_supports_face_attributes_p)
+	(Finternal_copy_lisp_face): Fix typo in docstring.
+	(Finternal_get_lisp_face_attribute): Fix docstring.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (syms_of_xfns): Provide x-toolkit also for GTK.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macfns.c (Fx_create_frame): Default to using tool-bar by
+	setting tool-bar-lines to 1 in default-frame-alist.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* image.c (xpm_scan, xpm_make_color_table_v, xpm_put_color_table_v)
+	(xpm_get_color_table_v, xpm_make_color_table_h)
+	(xpm_put_color_table_h, xpm_get_color_table_h)
+	(xpm_str_to_color_key, xpm_load_image, xpm_load)
+	(syms_of_image): Support XPM on Carbon Emacs.  Does not
+	depend on libXpm, but only supports XPM version 3 without extensions.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (x_flush, XTframe_up_to_date): Use FRAME_MAC_P
+	instead of FRAME_X_P
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (read_process_output): Grow decoding_buf when needed;
+	this could cause a crash in allocate_string and compact_small_strings.
+
[phone]  Jim Blandy  <[e-mail]>
+
+	* regex.c (mutually_exclusive_p): In 'case wordbeg', compare op2
+	against proper opcode.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* process.c (Fstart_process): Fix docstring.
+
+	* charset.c (Fget_unused_iso_final_char): Fix typos in docstring.
+	(Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction)
+	(Fsplit_char, Fchar_charset): Make argument names match their use
+	in docstring.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (print_preprocess): Use being_printed, loop_count and
+	halftail to detect overdeep nesting and cyclic cdr chains.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h (Fmake_symbolic_link): Declare.
+
+	* fileio.c (Frename_file): Remove extra argument in call to
+	Fmake_symbolic_link.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (calc_line_height_property): Use string position when
+	object is a string.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* print.c (temp_output_buffer_setup): Bind inhibit-read-only and
+	inhibit-modification-hooks to t temporarily before calling
+	Ferase_buffer.
+
+	* xfns.c (x_create_tip_frame): Bind inhibit-read-only and
+	inhibit-modification-hooks to t temporarily before calling
+	Ferase_buffer.
+
+	* w32fns.c (x_create_tip_frame): Bind inhibit-read-only and
+	inhibit-modification-hooks to t temporarily before calling
+	Ferase_buffer.
+
+	* fns.c (count_combining): Delete it.
+	(concat): Don't check combining bytes.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (Vw32_ansi_code_page): New Lisp variable.
+	(globals_of_w32fns): Set it.
+
[phone]  Piet van Oostrum  <[e-mail]>
+
+	* data.c (Fquo): Simplify.
+
[phone]  Peter Whaite  <[e-mail]>  (tiny change)
+
+	* data.c (Fquo): If any argument is float, do the computation in
+	floating point.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* process.c (Fwaiting_for_user_input_p, Fmake_network_process)
+	(Fset_process_query_on_exit_flag, Vprocess_adaptive_read_buffering):
+	Fix spelling of Emacs on docstring.
+	(Fset_process_coding_system, Fprocess_coding_system)
+	(Fset_process_filter_multibyte, Fprocess_filter_multibyte_p):
+	Make argument names match their use in docstring.
+	(Fprocess_id, Fprocess_query_on_exit_flag, Finterrupt_process):
+	Fix docstring.
+
+	* editfns.c (Finsert_buffer_substring): Make argument names match their
+	use in docstring.
+
+	* syntax.c (Fmodify_syntax_entry): Fix docstring.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
+	around call to ReceiveEvent to avoid certain crashes.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (mac_draw_line_to_pixmap, XCreatePixmapFromBitmapData)
+	(mac_fill_rectangle_to_pixmap, mac_draw_rectangle_to_pixmap)
+	(mac_copy_area_to_pixmap, mac_copy_area_with_mask_to_pixmap):
+	Save/restore the current graphics port and device handle when
+	drawing into an offscreen graphics world.
+
+	* image.c [MAC_OS] (XPutPixel, XGetPixel, image_load_qt_1)
+	(gif_load): Likewise.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* window.c (Fset_window_buffer): Fix docstring.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* emacs.c (main) [VMS]: Fix var ref.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* data.c (Fsetq_default): Fix docstring.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
+	to avoid name clash.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* fileio.c (barf_or_query_if_file_exists): Use lstat.
+	(Frename_file): Handle renaming of symlinks across file systems.
+	(Frename_file): Put symlink handling inside #ifdef S_IFLNK.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (Qtotal): New var.
+	(syms_of_xdisp): Intern and staticpro it.
+	(calc_line_height_property): New arg total.  Set it if
+	line-spacing property has format (total . VALUE).
+	(x_produce_glyphs): Ignore line-spacing if line-height is 0.
+	Handle total line-spacing property.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
+	"under" scroll bar when size/position changes.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* makefile.nt: Remove.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* syntax.h (SET_RAW_SYNTAX_ENTRY, SYNTAX_ENTRY_INT):
+	Avoid compiler warnings.
+
+	* Makefile.in (region-cache.o): Depend on config.h.
+
[phone]  Romain Francoise  <[e-mail]>
+
+	* indent.c (compute_motion): Save vpos in prev_vpos when dealing
+	with continuation lines, too.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* syssignal.h (init_signals): Move decl outside `#ifdef POSIX_SIGNALS'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (calc_line_height_property): YAILOM (yet another
+	int/Lisp_Object mixup).
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
+	undo bad effect of pack(4) in some versions of system headers.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (x_draw_hollow_cursor): Sync with xterm.c
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <line-spacing>: Allow float value.
+	(syms_of_buffer) <cursor-type>: Doc fix.
+
+	* dispextern.h (struct it): Remove member use_default_face.
+	Add members override_ascent, override_descent, override_boff.
+
+	* xdisp.c (init_iterator): Handle line-spacing float value.
+	Initialize override_ascent member.
+	(append_space_for_newline): Reset override_ascent.
+	Remove use_default_face.
+	(calc_line_height_property): New function to calculate value of
+	line-height and line-spacing properties.  Look at overlays, too.
+	Set override_ascent, override_descent, override_boff members when
+	using another face than the current face.  Float values are now
+	relative to the frame default font, by default; accept a cons
+	of ratio and face name to specify value relative to a specific face.
+	(x_produce_glyphs): Use calc_line_height_property.
+	Use override_ascent etc. when set to handle different face heights.
+	A negative line-spacing property value is interpreted as a total
+	line height, rather than inter-line spacing.
+	(note_mouse_highlight): Allocate room for 40 overlays initially.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* data.c (Fsubr_name): New fun.
+	(syms_of_data): Defsubr it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (null_glyph_slice): New var.
+	(append_glyph, append_composite_glyph, append_stretch_glyph):
+	Use it to initialize glyph slice.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup.
+	(on_hot_spot_p): Make sure we always return a value.
+	(Flookup_image_map): Remove unused var ix and iy.
+	(note_mode_line_or_margin_highlight): Remove unused var `image'.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (init_environment): If one of the TMP... environment
+	variables is set to a drive letter without a trailing slash,
+	append a slash.
+
[phone]  Matthew Mundell  <[e-mail]>
+
+	* editfns.c (lisp_time_argument): Provide externally.
+
+	* fileio.c (Fset_file_times): New function.
+	(syms_of_fileio): Intern and staticpro it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (x_produce_glyphs): Fix last change; handle newline in
+	header line strings.
+
+	* dispextern.h (struct it): New member use_default_face.
+
+	* xdisp.c (Qline_height): New variable.
+	(syms_of_xdisp): Intern and staticpro it.
+	(append_space_for_newline): Partially undo 2004-04-25 change;
+	add default_face_p arg, and restore callers.
+	Clear it->use_default_face after use.
+	(x_produce_glyphs): Set default font for ascii char if
+	it->use_default_font is set.  Change line-spacing property to set
+	just extra line spacing.  Handle new line-height property.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* print.c (print_object): Print non-ascii characters in bool
+	vector representation as octal escapes.
+
+	* lisp.h (BOOL_VECTOR_BITS_PER_CHAR): Define.
+	* print.c (print_object): Use it instead of BITS_PER_CHAR for
+	bool vectors.
+	* lread.c (read1): Likewise.
+	* alloc.c (Fmake_bool_vector): Likewise.
+	* data.c (Faref, Faset): Likewise.
+	* fns.c (Fcopy_sequence, concat, internal_equal, Ffillarray)
+	(mapcar1): Likewise.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* lread.c (init_lread): Fix typo in HAVE_CARBON test logic.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* lisp.h (CYCLE_CHECK): Macro moved from xfaces.c.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* buffer.c (Fpop_to_buffer): Fix docstring.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* lread.c (init_lread): Don't display missing lisp directory
+	warnings with Carbon Emacs because self-contained bundled Emacs
+	may be built without correct installation path.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.
+
+	* xterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.
+
+	* xdisp.c (append_space_for_newline): Rename from append_space.
+	Remove DEFAULT_FACE_P arg; always use current face.  Callers changed.
+	(x_produce_glyphs): Handle line-spacing property on newline char.
+	If value is t, adjust ascent and descent to fit current row height.
+	If value is an integer or float, set extra_line_spacing to integer
+	value, or to float value x current line height.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (Finternal_char_font): If POSITION is nil, return
+	font for displaying CH with the default face.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* makefile.w32-in: Add "-*- makefile -*-" mode tag.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (XINT) [EXPLICIT_SIGN_EXTEND && !NO_UNION_TYPE]:
+	Don't make assumptions about the relative place of i and val.
+	(EQ) [!NO_UNION_TYPE]: Don't forget to check the type match as well.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct glyph_slice): New struct.
+	(struct glyph): New member slice.
+	(GLYPH_SLICE_EQUAL_P): New macro.
+	(GLYPH_EQUAL_P): Use it.
+	(struct glyph_string): New member slice.
+	(struct it_slice): New struct.
+	(struct it): New member slice, add member to stack too.
+	New member constrain_row_ascent_descent_p.
+	(image_ascent): Add prototype.
+
+	* dispnew.c (buffer_posn_from_coords): Return full image width
+	and height even for image slices (posn is relative to full image).
+	(marginal_area_string): Adjust x0,y0 for image slice.
+
+	* image.c (image_ascent): Add slice arg; calculate ascent for
+	image slice (or full image).
+
+	* keyboard.c (Fposn_at_x_y, Fposn_at_point): New defuns.
+	(syms_of_keyboard): Defsubr them.
+
+	* lisp.h (pos_visible_p): Fix prototype.
+
+	* macterm.c (x_draw_relief_rect): Add top_p and bot_p args.
+	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+	(x_draw_image_foreground, x_draw_image_relief)
+	(x_draw_image_foreground_1, x_draw_image_glyph_string):
+	Draw sliced images.
+
+	* w32term.c (w32_draw_relief_rect): Add top_p and bot_p args.
+	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+	(x_draw_image_foreground, x_draw_image_relief)
+	(w32_draw_image_foreground_1, x_draw_image_glyph_string):
+	Draw sliced images.
+
+	* w32term.h (image_ascent): Remove prototype.
+
+	* window.c (Fpos_visible_in_window_p): Return pixel position if
+	PARTIALLY arg is non-nil.  Simplify.  Doc fix.
+	(Fwindow_vscroll, Fset_window_vscroll): Add optional PIXEL_P arg
+	to return/set vscroll in pixels.
+
+	* window.h (Fwindow_vscroll, Fset_window_vscroll): Fix EXFUN.
+
+	* xdisp.c (Qslice): New variable.
+	(syms_of_xdisp): Intern and staticpro it.
+	(pos_visible_p): Return pixel position in new x and y args.
+	(init_iterator): Reset it->slice info.
+	(handle_display_prop): Parse (slice ...) property.
+	(push_it, pop_it): Save/restore slice info.
+	(make_cursor_line_fully_visible): Fix 2004-04-14 change.  Do not
+	force repositioning of tall row if window is vscrolled, as that
+	would reset vscroll.
+	(append_space): Set it->constrain_row_ascent_descent_p to avoid
+	increasing row height if row is non-empty.
+	(fill_image_glyph_string): Copy slice info.
+	(take_vertical_position_into_account): Simplify.
+	(produce_image_glyph): Handle iterator slice info, setup glyph
+	slice info.  Do not force minimum line height.
+	(x_produce_glyphs): If it->constrain_row_ascent_descent_p is set,
+	do not increase height (ascent/descent) of non-empty row when
+	adding normal character glyph; instead reduce glyph ascent/descent
+	appropriately; if row is higher than current glyph, adjust glyph
+	descent/ascent to reposition glyph within the existing row.
+	Likewise, when char is newline, only set ascent/descent if row is
+	currently empty.
+	(note_mouse_highlight): Handle hotspots with sliced image.
+
+	* xterm.c (x_draw_relief_rect): Add top_p and bot_p args.
+	(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+	(x_draw_image_foreground, x_draw_image_relief)
+	(x_draw_image_foreground_1, x_draw_image_glyph_string):
+	Draw sliced images.
+
+	* xterm.h (image_ascent): Remove prototype.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (Fkey_description): Fix the usual int/Lisp_Object mixup.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* fns.c (Fassoc, Feql): Fix indentation.
+
+	* fontset.c (regularize_fontname): Rename from regulalize_fontname.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* fns.c (Feql): New function.
+	(syms_of_fns): Defsubr it.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32select.c (Fw32_set_clipboard_data): Get sequence number
+	after closing the clipboard.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (Fbuffer_base_buffer): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keymap.c (Fkey_description): Add optional PREFIX arg.
+	Combine prefix with KEYS to make up the full key sequence to describe.
+	Correlate meta_prefix_char and following (simple) key to describe
+	as meta modifier.  All callers changed.
+	(describe_map): Rename arg `keys' to `prefix'.  Remove local
+	`elt_prefix' var.  Use Fkey_description with prefix instead of
+	elt_prefix combined with Fsingle_key_description.
+	(describe_vector): Declare static.  Replace arg `elt_prefix' with
+	`prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
+	if !KEYMAP_P.  Use Fkey_description with prefix instead of
+	Fsingle_key_description.
+
+	* keymap.h (Fkey_description): Fix prototype.
+	(describe_vector): Remove prototype.
+
+	* xdisp.c (update_overlay_arrows): Fix handling of up_to_date < 0.
+
+	* image.c (PNG_BG_COLOR_SHIFT): Remove.
+	(png_load): Fix calculation of transparent background color on X
+	and W32 platforms.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+	not too large before computing how much to scroll.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* dired.c (Ffile_attributes): Don't pass extra nil arg to file-handler.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
+	Add hyperlink to Elisp manual to the docstring.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* callint.c (fix_command): Use XDCR.
+
[phone]  Nick Roberts  <[e-mail]>
+
+	* window.c (Fget_lru_window): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Fformat): Fix allocation size of precision array.
+
+	* dispnew.c (update_window): Only set changed_p if
+	scrolling_window actually did scroll.
+	(scrolling_window): Only return 1 if we actually did scroll.
+
+	* xdisp.c (get_glyph_string_clip_rect): Fix reduction of cursor
+	height to glyph height when cursor row is not fully visible.
+	(make_cursor_line_fully_visible): Add FORCE_P arg to return
+	failure in case row is higher than window.  Callers changed.
+	(try_scrolling): Fix loop in scrolling if last_line_misfit (from Gerd).
+	Try to scroll partially visible, higher-than-window cursor row.
+	(redisplay_window): Always try to scroll partially visible,
+	higher-than-window cursor row - both initially and again with
+	centering_position = 0.
+	Clear desired matrix before retrying with centering_position = 0.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (scan_lists): Simplify backward string scan.
+	Fix off-by-one boundary check for string and comment fences.
+
[phone]  Joe Buehler  <[e-mail]>
+
+	* sheap.c, unexcw.c: New files.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (Fmake_indirect_buffer): Throw an error if the intended
+	base buffer has been killed.  Correct the error message if the
+	base buffer does not exist.
+
[phone]  Joe Buehler  <[e-mail]>
+
+	* s/cygwin.h: Changes for Cygwin unexec() support, changes in
+	Cygwin itself.  Add support for Xaw3d scrollbars.
+
+	* puresize.h: Set up PURE_P() for Cygwin unexec() support.
+
+	* lastfile.c: Define my_endbss[] for Cygwin unexec() support.
+
+	* gmalloc.c (__default_morecore): Use bss_sbrk(), not __sbrk(),
+	before Cygwin unexec.
+
+	* Makefile.in: Link changes for Cygwin unexec() support.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* buffer.c (Fmake_indirect_buffer): Check that NAME is a string.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* buffer.c (Fgenerate_new_buffer_name): Return NAME argument if
+	IGNORE argument equals NAME.  Doc fix.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* buffer.c (fix_start_end_in_overlays): Make overlays
+	empty if they are backwards.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfaces.c (face_color_supported_p): Fix compilation without X11.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* doc.c (Fsnarf_documentation): Ignore new file name entries.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* msdos.c (clear_mouse_face): Only clear mouse highlight if not	hidden.
+	(dos_rawgetc): Set mouse_face_hidden after clearing highlight.
+
+	* w32term.c (w32_read_socket): Set mouse_face_hidden after
+	clearing highlight.
+
+	* xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+
+	* xterm.c (handle_one_xevent): Set mouse_face_hidden after
+	clearing highlight.
+
+	* indent.c (vmotion): Do not reserve one column for continuation
+	marks on window frames.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* charset.h (SINGLE_BYTE_CHAR_P): Fix macro to avoid warnings
+	from GCC.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* .gdbinit-union: Remove.
+
+	* .gdbinit: Make it work for USE_LSB_TAG and !NO_LISP_UNION.
+	(xgetptr, xgetint, xgettype): New funs.  Use them everywhere.
+	($nonvalbits): Remove.
+	($valmask): Set it by calling xreload to avoid redundancy.
+
+	* emacs.c (gdb_use_union, gdb_use_lsb): New vars.
+	(gdb_emacs_intbits): Remove.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* editfns.c (Fformat): Fix initialization of the array info.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (x_mouse_click_focus_ignore_position): New var.
+	(syms_of_xterm): DEFVAR_BOOL it.
+	(ignore_next_mouse_click_timeout): New var.
+	(handle_one_xevent): Clear it on KeyPress, set it on EnterNotify.
+	Use it to filter mouse clicks following focus event.
+
[phone]  David Ponce  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Fix last change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Fcommandp): Simplify.
+
+	* data.c (Finteractive_form): Rename from Fsubr_interactive_form.
+	Extend to handle all kinds of functions.
+
+	* lisp.h (Finteractive_form): Declare.
+
+	* callint.c (Fcall_interactively): Use it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp): Include `void-variable' in list_of_error
+	to catch errors in calc_pixel_width_or_height during redisplay.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* buffer.c (fix_start_end_in_overlays): Rename fix_overlays_in_range.
+
+	* lisp.h (fix_start_end_in_overlays): Likewise.
+
+	* insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
+
+	* editfns.c (Ftranspose_regions): Likewise.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): Do not pass key press events to GTK.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/sol2-6.h: Delete previous change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (move_it_in_display_line_to): Fix MOVE_TO_POS case when
+	to_charpos corresponds to newline in right fringe.  Use local
+	BUFFER_POS_REACHED_P macro.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
+	to compile on non-window system.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (calc_pixel_width_or_height): Add prototype.
+
+	* image.c (Qcenter): Move to xdisp.c.
+
+	* xdisp.c (Qcenter): Declare here.
+	(syms_of_xdisp): Intern and staticpro it.
+	(handle_single_display_prop): Allow space display property on all
+	platforms.
+	(display_mode_line): Set mode_line_p before displaying line.
+	(calc_pixel_width_or_height): Declare extern.  Add separate :align-to
+	handling.  Remove complex cases for fringes and scroll-bars.
+	Add left, right, and center alignment positions.  Add text (area)
+	width/height.  Return width or height for image specs.
+	(produce_stretch_glyph): Improve handling of :align-to.  Is now
+	relative to left of text area by default, but other base offsets
+	can be specified -- also for text lines.
+
+	* term.c (produce_glyphs): Handle IT_STRETCH.
+	(produce_stretch_glyph): New function to handle space width and
+	align-to display properties on non-window systems.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Fread_file_name): Set completion-ignore-case for
+	case-insensitive systems.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
+	when keymap and cursor are setup.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* Makefile.in (XMENU_OBJ) [HAVE_CARBON]: Do not include xmenu.o.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (x_find_image_file): Add prototype.
+
+	* image.c (x_find_image_file): Make extern.
+
+	* xfns.c (x_find_image_file): Remove prototype.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is defined.
+
+	* emacs.c (main): Call syms_of_xmenu only if HAVE_MENUS is defined.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fns.c (internal_equal): New arg PROPS controls comparing
+	text properties.  All callers changed.
+	(Fequal_including_properties): New function.
+	(syms_of_fns): defsubr it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	Fix image support on MAC.  From YAMAMOTO Mitsuharu.
+
+	* dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs.
+	(image_background, image_background_transparent): Fix prototypes.
+
+	* image.c (XImagePtr, XImagePtr_or_DC): Move typedefs to dispextern.h.
+
+	* macfns.c (x_list_fonts, x_get_font_info, x_load_font)
+	(x_query_font, x_find_ccl_program, x_set_window_size)
+	(x_make_frame_visible, mac_initialize, XCreatePixmap)
+	(XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
+	(mac_draw_line_to_pixmap): Move prototypes to macterm.h.
+
+	* macterm.h (x_list_fonts, x_get_font_info, x_load_font)
+	(x_query_font, x_find_ccl_program, x_set_window_size)
+	(x_make_frame_visible, mac_initialize, XCreatePixmap)
+	(XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
+	(mac_draw_line_to_pixmap): Add prototypes.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* macterm.c (XTread_socket): Fix mouse click on tool bar.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h: Move image related prototypes from xfns.c section
+	to image.c.  Condition them by HAVE_WINDOW_SYSTEM rather than
+	HAVE_X_WINDOWS.
+
+	* Makefile.in (XOBJ): Consolidate into one list.  Add image.o.
+	Move gtkutil.o to new GTK_OBJ list.
+	(XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
+	(GTK_OBJ) [USE_GTK]: New declaration.
+	(obj): Add $(GTK_OBJ) to list.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* image.c [MAC_OSX]: Include sys/stat.h.
+
+	* macfns.c (syms_of_macfns): Remove definitions of things now
+	defined in image.c.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidates the identical/similar image
+	support code previously found in xfns.c, w32fns.c, and macfns.c
+	into a new file image.c.
+
+	* makefile.w32-in (OBJ1): Add image.o.
+	($(BLD)/image.$(O)): Add dependencies.
+
+	* Makefile.in (XOBJ, MAC_OBJ): Add image.o.
+	(image.o): Add dependencies.
+
+	* image.c: New file with consolidated image support code.
+	(COLOR_TABLE_SUPPORT): New define to control whether
+	color table support is available (X only).
+	(Bitmap_Record): Common name for x_bitmap_record,
+	w32_bitmap_record, and mac_bitmap_record.
+	(XImagePtr): Common name for pointer to XImage or equivalent.
+	(XImagePtr_or_DC): New type to simplify code sharing; equivalent
+	to XImagePtr on X+MAC, and to HDC on W32.
+	(GET_PIXEL): Wrapper for XGetPixel or equivalent.
+	(NO_PIXMAP): Common name for "None" or equivalent.
+	(PNG_BG_COLOR_SHIFT): Bits to shift PNG background colors.
+	(RGB_PIXEL_COLOR): Common type for an integer "pixel color" value.
+	(PIX_MASK_RETAIN, PIX_MASK_DRAW): Portability macros (from macfns.c).
+	(FRAME_X_VISUAL, x_defined_color, DefaultDepthOfScreen):
+	Define with suitable equivalents on W32 and MAC for code sharing.
+	(XDrawLine): Define on MAC for code sharing.
+	(Destroy_Image, Free_Pixmap): Wrappers for code sharing.
+	(IF_LIB_AVAILABLE): Macro to simplify code sharing.
+	(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)
+	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
+	(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)
+	(find_image_fsspec, image_load_qt_1, image_load_quicktime)
+	(init_image_func_pointer, image_load_quartz2d)
+	(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): Consolidate image
+	code from xfns.c, w32fns.c, and macfns.c.
+	(syms_of_image): Consolidate image related symbol setup here.
+	(init_image): Consolidate image related initializations here.
+
+	* emacs.c (main) [HAVE_WINDOW_SYSTEM]: Add calls to syms_of_image
+	and init_image.  Remove call to init_xfns.
+
+	* macterm.h (struct mac_bitmap_record): Add file member.
+	Not currently used, but simplifies code sharing.
+
+	* macfns.c (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)
+	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
+	(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)
+	(find_image_fsspec, image_load_qt_1, image_load_quicktime)
+	(init_image_func_pointer, image_load_quartz2d)
+	(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.
+
+	* w32fns.c (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.
+
+	* xfns.c (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
+	w32fns.c and macfns.c image code into image.c.
+	(syms_of_xfns): Move image related symbols to image.c.
+	(init_xfns): Remove; initialization moved to init_image in image.c.
+
+	* lisp.h (syms_of_image, init_image): Add protoypes.
+	(init_xfns): Remove prototype.
+
+	* dispextern.h (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_create_bitmap_mask): Move prototypes from dispextern.h.
+	(gamma_correct) [MAC_OS]: Add prototype.
+
+	* xterm.h (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_create_bitmap_mask): Move prototypes to dispextern.h.
+
[phone]  Kenichi Handa  <handa@etlken2>
+
+	* coding.c (decode_coding_emacs_mule): Handle insufficent source
+	correctly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS): New definition.
+
+	* window.c (Fdisplay_buffer): Doc fix.
+
+	* buffer.c (Fpop_to_buffer): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (display_line): Fix call to get_overlay_arrow_glyph_row.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* editfns.c (Ftranslate_region): Lisp_Object/int mixup.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* doc.c (Fsubstitute_command_keys): Fix counding bytes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.h (struct window): New member overlay_arrow_bitmap.
+
+	* window.c (make_window): Initialize overlay_arrow_bitmap.
+
+	* xdisp.c (Voverlay_arrow_variable_list): New variable to properly
+	implement and integrate multiple overlay arrows with redisplay.
+	(syms_of_xdisp): DEFVAR_LISP and initialize it.
+	(last_arrow_position, last_arrow_string): Replace by properties.
+	(Qlast_arrow_position, Qlast_arrow_string)
+	(Qoverlay_arrow_string, Qoverlay_arrow_bitmap): New variables.
+	(syms_of_xdisp): Intern and staticpro them.
+	(overlay_arrow_string_or_property, update_overlay_arrows)
+	(overlay_arrow_in_current_buffer_p, overlay_arrows_changed_p)
+	(overlay_arrow_at_row): New functions for multiple overlay arrows.
+	(redisplay_internal): Use them instead of directly accessing
+	Voverlay_arrow_position etc. for multiple overlay arrows.
+	(mark_window_display_accurate): Use update_overlay_arrows.
+	(try_cursor_movement): Use overlay_arrow_in_current_buffer_p.
+	(try_window_id): Use overlay_arrows_changed_p.
+	(get_overlay_arrow_glyph_row): Add overlay_arrow_string arg.
+	(display_line): Use overlay_arrow_at_row to check multiple
+	overlay arrows, and get relevant overlay-arrow-string and
+	overlay-arrow-bitmap.  Set w->overlay_arrow_bitmap accordingly.
+	(produce_image_glyph): Set pixel_width = 0 for fringe bitmap.
+	(syms_of_xdisp): Remove last_arrow_position and last_arrow_string.
+
+	* fringe.c (draw_fringe_bitmap): Use w->overlay_arrow_bitmap if set.
+	(update_window_fringes): Remove unused code.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (w32_read_socket): Fix last change to ButtonPress handling.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* fringe.c (Fdefine_fringe_bitmap): Fix typo in docstring.
+
+	* makefile.w32-in ($(BLD)/fringe.$(O)): Add dependencies.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (Fx_display_color_cells): Use number of planes to calculate
+	how many colors can be displayed.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* editfns.c (Ftranslate_region): Handle multibyte chars in TABLE
+	correctly.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (update_window): Update header line also if there are
+	no other changes in window (move code after set_cursor label).
+
+	* lisp.h (mark_window_display_accurate): Remove prototype.
+
+	* window.c (window_loop, Fforce_window_update): Force mode line
+	updates by setting prevent_redisplay_optimizations_p and
+	update_mode_lines.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (x_window): Fix indentation.
+
+	* xterm.c (x_calc_absolute_position): Call x_real_positions
+	to get WM window sizes and use those to calculate position.
+	(x_set_offset): Remove code commented out.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_store_event_hold): New function to store
+	an event into kbd fifo, but with special handling of quit event;
+	a quit event is saved for later, and further events are discarded
+	until the saved quit event has been processed.
+	(kbd_buffer_store_event): Use kbd_buffer_store_event_hold.
+	(gen_help_event): Store help event in kbd fifo.
+	(NREAD_INPUT_EVENTS): Remove.
+	(read_avail_input): Adapt to new read_socket_hook interface.
+	Remove allocation and initialization of local input_event buffer,
+	as read_socket_hook stores events directly in fifo.  Allocate and
+	initialize local hold_quit event to handle postponed quit event
+	(and store it if set by kbd_buffer_store_event_hold).
+
+	* keyboard.h (kbd_buffer_store_event_hold): Add prototype.
+	(gen_help_event): Fix prototype.
+
+	* macterm.c (XTread_socket): Remove bufp_r and
+	numcharsp args.  Add hold_quit arg.
+	Rework to use just one, local, inev input_event.  Store inev
+	directly in fifo using kbd_buffer_store_event_hold.
+
+	* sysdep.c (BUFFER_SIZE_FACTOR): Remove.
+	(read_input_waiting): Adapt to new read_socket_hook interface.
+	Remove allocation and initialization of local input_event buffer,
+	as read_socket_hook stores events directly in fifo.  Allocate and
+	initialize local hold_quit event to handle postponed quit event
+	(and store it if set by kbd_buffer_store_event_hold).
+
+	* term.c (read_socket_hook): Fix arg list.
+
+	* termhooks.h (read_socket_hook): Fix prototype.
+
+	* w32inevt.c (w32_console_read_socket): Remove bufp_r and
+	numcharsp args.  Add hold_quit arg.
+	Rework to use just one, local, inev input_event.  Store inev
+	directly in fifo using kbd_buffer_store_event_hold.
+
+	* w32inevt.h (w32_console_mouse_position): Fix prototype.
+
+	* w32term.c (w32_read_socket): Remove bufp_r and numcharsp args.
+	Add hold_quit arg.  Rework to use just one, local, inev
+	input_event.  Store inev directly in fifo using
+	kbd_buffer_store_event_hold.  Update count in one place.
+	Postpone call to gen_help_event until inev is stored; use new
+	local do_help for this.
+	Remove local emacs_event in handing of ButtonPress event; just use
+	inev instead (so no reason to copy it later).
+
+	* xsmfns.c (x_session_check_input): Remove numchars arg.
+
+	* xterm.c (x_focus_changed, x_detect_focus_change):
+	Remove numchars arg.  Always store event into bufp arg.
+	Return nothing.  Callers changed accordingly.
+	(glyph_rect): Simplify.
+	(STORE_KEYSYM_FOR_DEBUG): New macro.
+	(SET_SAVED_MENU_EVENT): Use inev instead of bufp, etc.
+	(current_bufp, current_numcharsp) [USE_GTK]: Remove.
+	(current_hold_quit) [USE_GTK]: Add.
+	(event_handler_gdk): Adapt to new handle_one_xevent.
+	(handle_one_xevent): Remove bufp_r and numcharsp args.
+	Add hold_quit arg.  Rework to use just one, local, inev
+	input_event.  Store inev directly in fifo using
+	kbd_buffer_store_event_hold.  Update count in one place.
+	Postpone call to gen_help_event until inev is stored; use new
+	local do_help for this.
+	Simplify handling of keysyms (consolidate common code).  Fix bug
+	where count was updated with nchars instead of nbytes.
+	Remove local emacs_event in handing of ButtonPress event; just use
+	inev instead (so no reason to copy it later).
+	Remove `out' label.  Rename label `ret' to `done'; add various
+	`goto done' to clarify code flow in deeply nested blocks.
+	(x_dispatch_event): Simplify as handle_one_xevent now calls
+	kbd_buffer_store_event itself.
+	(XTread_socket): Remove bufp_r and numcharsp args.  Add hold_quit
+	arg.  Call handle_one_xevent with new arglist.  Store event from
+	x_session_check_input in fifo.
+	[USE_GTK]: Setup current_hold_quit.
+	Decrement handling_signal before unblocking input.
+	(x_initialize) [USE_GTK]: Initialize current_count.
+
+	* xterm.h (x_session_check_input): Fix prototype.
+
[phone]  YAMAMOTO Mitsuharu  <[e-mail]>
+
+	* s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework QuickTime'.
+
+	* dispextern.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
+	macgui.h).
+
+	* emacs.c (main) [HAVE_CARBON]: Call init_xfns.
+
+	* macgui.h [MAC_OSX]: Include Carbon/Carbon.h.
+	(mktime, DEBUG, Z, free, malloc, realloc, max, min)
+	(init_process) [MAC_OSX] : Avoid conflicts with Carbon/Carbon.h.
+	[!MAC_OSX]: Include QDOffscreen.h and Controls.h.
+	(INFINITY) [MAC_OSX]: Avoid conflict with definition in math.h.
+	(Bitmap): Remove typedef.
+	(Pixmap): Change int to GWorldPtr.
+
+	* macmenu.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
+
+	* macterm.h [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
+	(RED16_FROM_ULONG, GREEN16_FROM_ULONG, BLUE16_FROM_ULONG):
+	New #define to extract 16-bit depth color components from unsigned
+	long representation.
+	(PIX_MASK_DRAW, PIX_MASK_RETAIN): New #define to represent pixel
+	colors used for masks.
+	(struct mac_display_info): Add color_p.  Remove n_cbits.
+
+	* macfns.c: Include sys/types.h and sys/stat.h.
+	[MAC_OSX]: Do not include Carbon/Carbon.h (now in macgui.h).
+	Include QuickTime/QuickTime.h.
+	(XCreatePixmap, XCreatePixmapFromBitmapData, XFreePixmap)
+	(XSetForeground, mac_draw_line_to_pixmap): Add externs for
+	functions defined in macterm.c.
+	(XImagePtr): New typedef.  Corresponds to XImage * in xfns.c.
+	(ZPixmap): New #define for compatibility with xfns.c.
+	(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
+	(x_create_x_image_and_pixmap, x_destroy_x_image, x_put_x_image)
+	(find_image_fsspec, image_load_qt_1, image_load_quicktime):
+	New functions.
+	(four_corners_best, x_create_x_image_and_pixmap)
+	(x_destroy_x_image, unwind_create_frame, x_disable_image)
+	(x_edge_detection, init_color_table, colors_in_color_table)
+	(lookup_rgb_color, lookup_pixel_color, postprocess_image)
+	(x_put_x_image, slurp_file, xbm_scan, xbm_load, xbm_load_image)
+	(xbm_image_p, xbm_read_bitmap_data, xbm_file_p, x_to_xcolors)
+	(x_from_xcolors, x_detect_edges): New declarations (from xfns.c).
+	(mac_color_map_lookup, x_to_mac_color): Fix Lisp_Object/unsigned
+	long mixup.
+	(mac_defined_color, x_to_x_colors): Use RED16_FROM_ULONG etc.
+	(x_decode_color): Don't use n_cbits (in struct mac_display_info).
+	(x_set_foreground_color, x_set_cursor_color): Sync with w32fns.c.
+	(x_set_cursor_type, Fxw_color_values, valid_image_p)
+	(image_value_type, parse_image_spec, image_ascent, x_clear_image)
+	(x_alloc_image_color, clear_image_cache, lookup_image)
+	(x_find_image_file, xbm_read_bitmap_file_data)
+	(enum xbm_keyword_index, xbm_format, xbm_image_p, xbm_scan)
+	(xbm_read_bitmap_data, xbm_load, pbm_image_p, pbm_scan_number)
+	(enum pbm_keyword_index, pbm_format, enum png_keyword_index)
+	(png_format, png_image_p, enum jpeg_keyword_index, jpeg_format)
+	(jpeg_image_p, enum tiff_keyword_index, tiff_format, tiff_image_p)
+	(enum gif_keyword_index, gif_format, gif_image_p): Sync with xfns.c.
+	(x_make_gc): Sync with xfns.c.  Enclose unused `border_tile' with
+	#if 0.
+	(x_free_gcs): Sync with xfns.c.  Enclose unused `border_tile' with
+	#if 0.  Free white_relief.gc and black_relief.gc.
+	(unwind_create_frame, x_emboss, x_laplace, x_edge_detection):
+	New functions (from xfns.c).
+	(Fx_create_frame): Record unwind_create_frame.
+	(Fxw_display_color_p): Use dpyinfo->color_p.
+	(Fx_display_grayscale_p, Fx_display_planes): Don't use
+	dpyinfo->n_cbits.
+	(Fx_display_color_cells): Use dpyinfo->n_planes;
+	(QCmatrix, QCcolor_adjustment, QCmask, Qemboss, Qedge_detection)
+	(Qheuristic, cross_disabled_images, emboss_matrix)
+	(laplace_matrix): New variables (from xfns.c).
+	(Fimage_size, Fimage_mask_p, four_corners_best, image_background)
+	(x_clear_image_1, postprocess_image, slurp_file, xbm_load_image)
+	(xbm_file_p, x_to_xcolors, x_from_xcolors, x_detect_edges)
+	(image_background_transparent): New function (from xfns.c).
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	(image_load_quicktime): Add declaration.
+	[MAC_OSX] (image_load_quartz2d): Likewise.
+	[MAC_OSX] (CGImageCreateWithPNGDataProviderProcType): New typedef.
+	[MAC_OSX] (MyCGImageCreateWithPNGDataProvider): New variable.
+	[MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New funs.
+	(xbm_load_image_from_file, x_laplace_read_row)
+	(x_laplace_write_row, pbm_read_file): Remove functions.
+	[HAVE_XPM] (enum xpm_keyword_index, xpm_format, xpm_image_p)
+	(xpm_load): Sync with xfns.c (although XPM is not supported yet).
+	(colors_in_color_table): Sync with xfns.c (although not used).
+	(lookup_rgb_color): Don't lookup color table.  Just do gamma
+	correction.
+	(COLOR_INTENSITY): New #define (from xfns.c).
+	(x_disable_image): New function (from xfns.c).
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	(x_build_heuristic_mask): Sync with xfns.c.
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	(HAVE_PBM): Remove #ifdef.
+	(pbm_load): Sync with xfns.c.  Set img->width and img->height
+	before IMAGE_BACKGROUND.
+	(png_image_p, png_load): Don't enclose declarations with #if HAVE_PNG.
+	(Qpng, enum png_keyword_index, png_format, png_type, png_image_p):
+	Don't enclose with #if HAVE_PNG.
+	[!HAVE_PNG] (png_load) [MAC_OSX]: Use image_load_quartz2d if a
+	symbol _CGImageCreateWithPNGDataProvider is defined.
+	Otherwise use image_load_quicktime.
+	[!HAVE_PNG] (png_load) [!MAC_OSX]: Use image_load_quicktime.
+	[HAVE_PNG] (png_load): Sync with xfns.c.
+	Use PIX_MASK_DRAW/PIX_MASK_RETAIN.
+	(jpeg_image_p, jpeg_load): Don't enclose declarations with #if
+	HAVE_JPEG.
+	(Qjpeg, enum jpeg_keyword_index, jpeg_format, jpeg_type)
+	(jpeg_image_p): Don't enclose with #if HAVE_JPEG.
+	[!HAVE_JPEG] (jpeg_load) [MAC_OSX]: Use image_load_quartz2d.
+	[!HAVE_JPEG] (jpeg_load) [!MAC_OSX]: Use image_load_quicktime.
+	[HAVE_JPEG] (jpeg_load): Sync with xfns.c.
+	(tiff_image_p, tiff_load): Don't enclose declarations with #if
+	HAVE_TIFF.
+	(Qtiff, enum tiff_keyword_index, tiff_format, tiff_type)
+	(tiff_image_p): Don't enclose with #if HAVE_TIFF.
+	[!HAVE_TIFF] (tiff_load): Use image_load_quicktime.
+	[HAVE_TIFF] (tiff_error_handler, tiff_warning_handler):
+	New functions (from xfns.c).
+	[HAVE_TIFF] (tiff_load): Sync with xfns.c.
+	(gif_image_p, gif_load): Don't enclose declarations with #if HAVE_GIF.
+	(Qgif, enum gif_keyword_index, gif_format, gif_type, gif_image_p):
+	Don't enclose with #if HAVE_GIF.
+	[!HAVE_GIF] (gif_load): Use Quicktime Movie Toolbox if it is
+	animated gif.  Otherwise use image_load_quicktime.
+	[HAVE_GIF] (gif_lib.h): Temporarily define DrawText as
+	gif_DrawText to avoid conflict with QuickdrawText.h.
+	[HAVE_GIF] (gif_load): Sync with xfns.c.
+	(enum gs_keyword_index, gs_format, gs_image_p, gs_load)
+	[HAVE_GHOSTSCRIPT] (x_kill_gs_process): Sync with xfns.c (although
+	Ghostscript is not supported yet).
+	(syms_of_macfns): Initialize Qemboss, Qedge_detection, Qheuristic,
+	QCmatrix, QCcolor_adjustment, and QCmask.  Add DEFVAR_BOOL
+	cross_disabled_images (from xfns.c).  Remove #if 0 for supported
+	image types.  Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
+	HAVE_PNG.  Add defsubr for Simage_size and Simage_mask_p.
+	(init_xfns): Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
+	HAVE_PNG.  Call EnterMovies to support animated gifs.
+	Call init_image_func_pointer to bind a symbol
+	_CGImageCreateWithPNGDataProvider if it is defined.
+
+	* macterm.c [MAC_OSX]: Don't include Carbon/Carbon.h (now in macgui.h).
+	(x_draw_bar_cursor): Sync declaration with xterm.c.
+	(XFreePixmap, mac_draw_rectangle_to_pixmap, mac_copy_area)
+	(mac_copy_area_to_pixmap): Implementation with GWorld (offscreen
+	graphics).
+	(mac_set_forecolor, mac_set_backcolor): Use RED16_FROM_ULONG etc.
+	(mac_draw_line_to_pixmap, XCreatePixmap)
+	(XCreatePixmapFromBitmapData, mac_fill_rectangle_to_pixmap)
+	(mac_copy_area_with_mask, mac_copy_area_with_mask_to_pixmap):
+	New functions.
+	(mac_draw_bitmap) [TARGET_API_MAC_CARBON]:
+	Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
+	Cast bits to char *.
+	(reflect_byte): New function (from w32fns.c).
+	(mac_create_bitmap_from_bitmap_data): Use it and don't stuff bits
+	due to byte alignment.
+	(mac_scroll_area) [TARGET_API_MAC_CARBON]:
+	Use GetPortBitMapForCopyBits instead of the cast to Bitmap *.
+	(XSetForeground): Remove static (now used in macfns.c).
+	(HIGHLIGHT_COLOR_DARK_BOOST_LIMIT): New #define (from w32term.c).
+	(mac_alloc_lighter_color, x_destroy_window): Sync with w32term.c.
+	(x_setup_relief_color, x_setup_relief_colors, x_draw_box_rect)
+	(x_draw_glyph_string_box, x_draw_image_foreground)
+	(x_draw_image_foreground_1, x_draw_image_glyph_string)
+	(x_draw_stretch_glyph_string, x_draw_glyph_string)
+	(x_draw_hollow_cursor, x_draw_bar_cursor, mac_draw_window_cursor):
+	Sync with xterm.c.
+	(x_draw_relief_rect): Sync with xterm.c.  Make 1 pixel shorter
+	than the xterm.c version when a strictly horizontal or vertical
+	line is drawn.
+	(XTset_terminal_window): Add static.
+	(x_make_frame_visible): Add UNBLOCK_INPUT.
+	(x_free_frame_resources): New funcion (from xterm.c).
+	(XTread_socket): Call handle_tool_bar_click if mouse up/down event
+	occurs in tool bar area.
+	(mac_initialize_display_info): Remove dpyinfo->n_cbits.
+	Set dpyinfo->color_p.  Determine dpyinfo->n_planes using HasDepth.
+	Initialize image cache.
+	(stricmp, wildstrieq, mac_font_pattern_match, mac_font_match):
+	Enclose unused functions with #if 0.
+	(Qbig5, Qcn_gb, Qsjis, Qeuc_kr): New variables.
+	(decode_mac_font_name): New function to apply code conversions
+	from a mac font name to an XLFD font name according to its script code.
+	(x_font_name_to_mac_font_name): Apply code conversion from an XLFD
+	font name to a mac font name according to REGISTRY and ENCODING fields.
+	(init_font_name_table) [TARGET_API_MAC_CARBON]: Don't use a font
+	whose name starts with `.'.
+	(init_font_name_table): Use decode_mac_font_name.  Add both
+	jisx0208.1983-sjis and jisx0201.1976-0 entries if the script code
+	of a font is smJapanese.
+	(mac_do_list_fonts): New function to list fonts that match a given
+	pattern.
+	(x_list_fonts, XLoadQueryFont): Use it.
+	(XLoadQueryFont): Set rbearing field for each variable width
+	character to avoid needless redraw.
+	(syms_of_macterm): Initialize Qbig5, Qcn_gb, Qsjis, and Qeuc_kr.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (NREAD_INPUT_EVENTS): Temporarily increase to 512
+	as read_socket_hook handler on X aborts if buffer is too small
+	and W32 handler doesn't always check buffer limit.
+
+	* xdisp.c (handle_single_display_prop): Handle left-fringe and
+	right-fringe similar to a display margin image.  Specifically,
+	the characters having the fringe prop are no longer shown, and
+	we use IT_IMAGE/next_element_from_image with image_id = -1 to
+	do this.  Set fringe bitmap face_id in it->face_id.
+	(produce_image_glyph): Handle image_id < 0 as "no image" case, but
+	still realize it->face (i.e. the fringe bitmap face).
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xdisp.c (check_it): Check string/string_pos consistency.
+	(init_iterator): Initialize string-related fields properly.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xdisp.c (produce_image_glyph): Force negative descents to zero.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfns.c (lookup_image): Remove xassert(!interrupt_input_blocked);
+	BLOCK_INPUT can be nested, so it doesn't make much sense.
+
[phone]  Michael Mauger  <[e-mail]>
+
+	* w32fns.c (slurp_file, xbm_scan, xbm_load_image)
+	(xbm_read_bitmap_data): Use unsigned char for image data.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* abbrev.c (Finsert_abbrev_table_description): Doc fix.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (w32_draw_fringe_bitmap): Draw overlaid bitmaps
+	correctly over other bitmaps.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* emacs.c (USAGE1): Split into two halves.
+	(USAGE2): Second half of the old USAGE1.
+	(USAGE3): Rename from USAGE2.
+	(USAGE4): Rename from USAGE3.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* emacs.c (USAGE1): Add --no-desktop.  Move --display from USAGE2.
+	Fix --multibyte.  Move --help, --version to USAGE2.  Add alias
+	--file.  Fix -f, -l.  Sort options.  Untabify.
+	(USAGE2): Add -hb.  Fix --name, --title.  Sort options.  Untabify.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* category.c (Fdefine_category, Fcategory_docstring)
+	(Fget_unused_category, Fset_category_table)
+	(Fcategory_set_mnemonics): Doc fixes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c: Undo 2004-02-16 and 2004-02-17 changes.
+	The following changes are relative to the 2004-01-21 revision.
+	(NREAD_INPUT_EVENTS): Define as max number of input events to read
+	in one call to read_socket_hook.  Value is 8.
+	(read_avail_input): Separate and rework handling of read_socket_hook
+	and non-read_socket_hook cases.  Use smaller input_event buffer
+	in read_socket_hook case, and repeat if full buffer is read.
+	Use new local variable 'discard' to skip input after C-g.
+	In non-read_socket_hook case, just use a single input_event, and
+	call kbd_buffer_store_event on the fly for each character.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (union Lisp_Object): Give a more precise type for `type'.
+	Remove unused `gu' alternative.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* fringe.c (Fdefine_fringe_bitmap): Use && instead of & to avoid
+	warning.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_window_cursor_type, display_and_set_cursor):
+	Fix last change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (fast_find_position): Fix return value of new version;
+	it was inverted compared to the 21.1 version.
+	(get_window_cursor_type): Don't look at glyph if NULL.
+	(display_and_set_cursor): Set glyph to NULL if cursor in fringe.
+
+	* keyboard.c: Rework previous change; it didn't consider that the
+	buf array was allocated on the stack.
+	(prev_read): Remove variable.
+	(read_avail_input_buf): New static event buffer array.
+	(in_read_avail_input): New static variable to handle re-entrancy.
+	(read_avail_input): Change buf to pinter to read_avail_input_buf.
+	Use in_read_avail_input to handle re-entrance; when re-entered,
+	fully initialize and use tmp_buf array instead of read_avail_input_buf.
+	Do not initialize read_avail_input_buf in full here; instead assume it
+	is always cleared on entry.  To ensure that, we clear (just) the
+	entries that were used before we return.
+	(init_keyboard): Initialize read_avail_input_buf here.
+
[phone]  Jesper Harder  <[e-mail]>
+
+	* cmds.c (Fend_of_line): Doc fix.
+
[phone]  Dmitry Antipov  <[e-mail]>  (tiny change)
+
+	* keyboard.c (prev_read): New static variable.
+	(read_avail_input): Use it to zero out only those slots in buf[]
+	that were used last time we were called.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (obj): Move fringe.o from here...
+	(XOBJ, MAC_OBJ): ...to here.
+
[phone]  Stephen Eglen  <[e-mail]>
+
+	* fringe.c (init_fringe_bitmap): Define j in MAC_OS code.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* data.c (Fbyteorder):
+	* fringe.c (Fdefine_fringe_bitmap):
+	* xdisp.c (handle_single_display_prop):
+	* xselect.c (x_handle_dnd_message): Lisp_Object/int mixup.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (w32_draw_fringe_bitmap): Handle overlay fringe bitmaps.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (Vmac_emulate_three_button_mouse): New variable for
+	controlling emulation of a three button mouse with option and
+	command keys.
+	(Qreverse, mac_get_enumlated_btn): Handle the emulation.
+	(mac_event_to_emacs_modifiers, XTread_socket): Ditto.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
+
+	* fringe.c (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]:
+	Perform byte-swapping.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct draw_fringe_bitmap_params): Change member
+	bits from char to short to facilitate wider bitmaps.
+	(struct redisplay_interface): Fix prototype of define_fringe_bitmap
+	member.
+
+	* fringe.c (struct fringe_bitmap): Change member bits from char to
+	short to facilitate 16 bits wide bitmaps.  Modify all standard
+	bitmaps accordingly.
+	(BYTES_PER_BITMAP_ROW, STANDARD_BITMAP_HEIGHT): New macros.
+	(FRBITS): Use STANDARD_BITMAP_HEIGHT instead of just sizeof.
+	(draw_fringe_bitmap): Ditto.
+	(init_fringe_bitmap) [MAC_OS]: Don't bitswap.
+	(init_fringe_bitmap) [HAVE_X_WINDOWS]: Enhance bitswapping to
+	handle up to 16 bits wide bitmaps.
+	(Fdefine_fringe_bitmap): Doc fix.  Handle wider bitmaps.
+	(Ffringe_bitmaps_at_pos): Add missing arg declarations.
+
+	* macterm.c (mac_draw_bitmap): Handle 16 bits wide bitmaps directly.
+	(x_draw_fringe_bitmap): Use enhanced mac_draw_bitmap, so we no longer
+	need to call mac_create_bitmap_from_bitmap_data and mac_free_bitmap.
+
+	* w32term.c (w32_define_fringe_bitmap): Bitmaps are now 16 bits wide,
+	so it is no longer necessary to expand them here.
+
+	* xterm.c (x_draw_fringe_bitmap): Handle wider bitmaps (max 16 bits).
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (Fwindow_fringes): Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xselect.c (x_get_foreign_selection): Add new optional parameter
+	time_stamp.
+	(Fx_get_selection_internal): Ditto, pass time_stamp to
+	x_get_foreign_selection.
+
+	* data.c (Fbyteorder): New function.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* atimer.c: Move include stdio.h to same place as in other files.
+
+	* region-cache.c: Ditto.
+
+	* sysdep.c: Ditto.
+
+	* xfaces.c: Ditto.
+
[phone]  Sam Steingold  <[e-mail]>
+
+	* w32term.c (w32_draw_fringe_bitmap): Fix a typo in the last patch.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fringe.c: New file.  Move original fringe related declarations
+	and code from dispextern.h and xdisp.c here.
+	Rework code to support user defined fringe bitmaps, redefining
+	standard bitmaps, ability to overlay user defined bitmap with
+	overlay arrow bitmap, and add faces to bitmaps.
+	(Voverflow_newline_into_fringe): Declare here.
+	(enum fringe_bitmap_align): New enum.
+	(..._bits): All bitmaps are now defined without bitswapping; that
+	is now done in init_fringe_once (if necessary).
+	(standard_bitmaps): New array with specifications for the
+	standard fringe bitmaps.
+	(fringe_faces): New array.
+	(valid_fringe_bitmap_id_p): New function.
+	(draw_fringe_bitmap_1): Rename from draw_fringe_bitmap.
+	(draw_fringe_bitmap): New function which draws fringe bitmap,
+	possibly overlaying bitmap with cursor in right fringe or the
+	overlay arrow in the left fringe.
+	(update_window_fringes): Do not handle overlay arrow here.
+	Compare and copy fringe bitmap faces.
+	(init_fringe_bitmap): New function.
+	(Fdefine_fringe_bitmap, Fdestroy_fringe_bitmap): New DEFUNs to
+	define and destroy user defined fringe bitmaps.
+	(Fset_fringe_bitmap_face): New DEFUN to set face for a fringe bitmap.
+	(Ffringe_bitmaps_at_pos): New DEFUN to read current fringe bitmaps.
+	(syms_of_fringe): New function.  Defsubr new DEFUNs.
+	DEFVAR_LISP Voverflow_newline_into_fringe.
+	(init_fringe_once, init_fringe): New functions.
+	(w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: New functions.
+
+	* Makefile.in (obj): Add fringe.o.
+	(fringe.o): New dependencies.
+
+	* dispextern.h (FRINGE_ID_BITS): New definition for number of
+	bits allocated to hold a fringe number.  Increase number of bits
+	from 4 to 8 to allow user defined fringe bitmaps.
+	(struct glyph_row, struct it): New members left_user_fringe_bitmap,
+	left_user_fringe_face_id, right_user_fringe_bitmap,
+	right_user_fringe_face_id.
+	(enum fringe_bitmap_type, struct fringe_bitmap, fringe_bitmaps):
+	Move to new file fringe.c.
+	(MAX_FRINGE_BITMAPS): Define here.
+	(struct draw_fringe_bitmap_params): New members bits, cursor_p,
+	and overlay_p.  Change member which to int.
+	(struct redisplay_interface): New members define_fringe_bitmap
+	and destroy_fringe_bitmap.
+	(valid_fringe_bitmap_id_p): Add prototype.
+	(w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: Add prototypes.
+
+	* dispnew.c (row_equal_p): Compare fringe bitmap faces and overlay
+	arrows.
+	(update_frame): Do flush_display if force_flush_display_p to
+	ensure display (specifically fringes) are updated in a timely
+	manner when resizing the frame by dragging the mouse.
+	(update_window_line): Update row if overlay arrow changed.
+	(scrolling_window): Redraw fringe bitmaps if fringe bitmap faces
+	or overlay arrow changed.
+
+	* emacs.c (main) [HAVE_WINDOW_SYSTEM]: Call init_fringe_once,
+	syms_of_fringe, and init_fringe.
+
+	* frame.h (struct frame): New member force_flush_display_p.
+
+	* lisp.h (syms_of_fringe, init_fringe, init_fringe_once):
+	Add prototypes.
+
+	* macterm.c (mac_draw_bitmap): Add overlay_p arg.
+	(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps;
+	thanks to YAMAMOTO Mitsuharu for advice on how to do this.
+	Use cursor color for displaying cursor in fringe.
+	(x_redisplay_interface): Add null handlers for
+	define_fringe_bitmap and destroy_fringe_bitmap functions.
+
+	* w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from
+	xterm.c to handle overlayed fringe bitmaps and to use cursor color
+	for displaying cursor in fringe.
+	(w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
+	specific functions to define and destroy fringe bitmaps in fringe_bmp.
+	(w32_redisplay_interface): Add them to redisplay_interface.
+	(w32_term_init): Call w32_init_fringe instead of explicitly
+	defining fringe bitmaps in fringe_bmp array.
+	(x_delete_display): Call w32_reset_fringes instead of explicitly
+	destroying fringe bitmaps in fringe_bmp array.
+
+	* xdisp.c (Voverflow_newline_into_fringe, syms_of_xdisp)
+	(left_bits, right_bits, up_arrow_bits, down_arrow_bits)
+	(continued_bits, continuation_bits, ov_bits, first_line_bits)
+	(last_line_bits, filled_box_cursor_bits, hollow_box_cursor_bits)
+	(bar_cursor_bits, hbar_cursor_bits, zv_bits, hollow_square_bits)
+	(fringe_bitmaps, draw_fringe_bitmap, draw_row_fringe_bitmaps)
+	(draw_window_fringes, compute_fringe_widths, update_window_fringes):
+	Move fringe handling vars and code to new file fringe.c.
+	(handle_display_prop): Handle left-fringe and right-fringe
+	display properties; store user fringe bitmaps in iterator.
+	(move_it_in_display_line_to): Handle cursor in fringe at eob.
+	(clear_garbaged_frames): Set force_flush_display_p if resized.
+	(redisplay_window): Redraw fringe bitmaps if not just_this_one_p.
+	(display_line): Handle cursor in fringe at eob.
+	(display_line): Set row user fringe bitmaps from iterator.
+
+	* xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps.
+	Use cursor color for displaying cursor in fringe.
+	(x_redisplay_interface): Add null handlers for
+	define_fringe_bitmap and destroy_fringe_bitmap functions.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* macfns.c (Fx_change_window_property): Make doc string and
+	parameters same as for X version.
+
+	* w32fns.c (Fx_change_window_property): Ditto.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (hscroll_window_tree): Position cursor near to right
+	margin in hscrolled window when jumping to end of line (rather
+	than centering cursor).
+
+	* process.c (wait_reading_process_input): Don't do adaptive read
+	buffering if waiting for a specific process.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* minibuf.c (Fminibufferp, Fread_from_minibuffer)
+	(Fread_minibuffer, Feval_minibuffer)
+	(Fread_string, Fread_no_blanks_input)
+	(Fcompleting_read): Doc fixes.
+	(syms_of_minibuf): Doc fixes for minibuffer-completion-table and
+	completion-regexp-list.  Define Qcase_fold_search and staticpro it.
+	(read_minibuf): Fix initial comment.
+	(Ftry_completion, Fall_completions, Ftest_completion): Bind
+	case-fold-search to the value of completion-ignore-case when
+	checking completion-regexp-list.
+	(Fdisplay_completion_list): Make it handle arguments that are
+	symbols.  Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h: Add declaration of free_frame_menubar.
+
+	* xfns.c (x_create_bitmap_mask): Removed unused variable depth.
+	(x_set_menu_bar_lines): Added ! defined USE_GTK for olines.
+	(Fx_change_window_property): Add declaration of parameters type and
+	format.  Remove unused variable cons.
+
+	* xselect.c: Include stdio,h.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (Fset_char_table_range): Fix previous change.
+
+	* buffer.c (Fset_buffer_multibyte): Fix docstring.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* editfns.c (Fchar_after, Fchar_before): Doc fixes.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (Vmouse_events): Rename from Vmenu_events.
+	(syms_of_keymap): Add mouse-[45], header-line, and mode-line to it.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (Fset_char_table_range): Handle charsets ascii,
+	eight-bit-control, and eight-bit-graphic correctly.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32select.c (Fw32_set_clipboard_data): Make coding iso2022 safe.
+
+	* w32fns.c (x_to_w32_font): Likewise.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h: Add x_handle_dnd_message, x_check_property_data,
+	x_fill_property_data, x_property_data_to_lisp and check_x_display_info.
+
+	* xterm.c (handle_one_xevent): Call x_handle_dnd_message for
+	ClientMessages.
+
+	* xselect.c: Include termhooks.h and X11/Xproto.h
+	(x_check_property_data, x_fill_property_data)
+	(x_property_data_to_lisp, mouse_position_for_drop)
+	(Fx_get_atom_name, x_handle_dnd_message): New functions for DND support.
+	(Fx_send_client_event): Move here from xfns.c.
+	(syms_of_xselect): Add Sx_get_atom_name and Sx_send_client_message.
+
+	* xfns.c (x-send-client-message): Move to xselect.c
+	(Fx_change_window_property): Add optional arguments TYPE, FORMAT and
+	OUTER_P.
+	(Fx_window_property): Add optional arguments TYPE, SOURCE, DELETE_P,
+	VECTOR_RET_P.  Handle AnyPropertyType.  Call x_property_data_to_lisp
+	if vector_ret_p is true.
+	(syms_of_xfns): Sx_send_client_message moved to xselect.c.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* fileio.c (Fcopy_file): If NEWNAME is a directory, expand the
+	basename of FILE relative to it, not FILE itself.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (coding_restore_composition): Check invalid
+	composition data more rigidly.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fileio.c (Fread_file_name_internal): Correctly handle the case
+	where insert-default-directory is nil.
+	(Fread_file_name): Always return an empty string if the user exits
+	with an empty minibuffer.  Adapt the docstring accordingly.
+	(syms_of_fileio): Adapt the docstring of insert-default-directory
+	to the change in Fread_file_name.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* alloca.c [!alloca]: Fix the prototype for xfree.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (string_char_to_byte): Optimize for ASCII only string.
+	(string_byte_to_char): Likewise.
+
[phone]  Peter Runestig  <[e-mail]>
+
+	* makefile.w32-in, w32fns.c: Add `default-printer-name' function.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* unexmacosx.c (unexec_copy): Do not copy more than was
+	requested to prevent overwriting during unexec.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* process.c (sigchld_handler): Add comment about not calling malloc.
+
+	* process.h: Add extern to synch_process_termsig.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (make_mac_frame, make_mac_terminal_frame):
+	Move setting of scroll bars from make_mac_frame to
+	make_mac_terminal_frame to prevent clobbering of scroll-bar-mode.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (Freplace_match): Handle nonexistent
+	back-references properly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (decode_any_window): New function.
+	(Fwindow_height, Fwindow_width, Fwindow_edges)
+	(Fwindow_pixel_edges, Fwindow_inside_edges)
+	(Fwindow_inside_pixel_edges): Use decode_any_window.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* process.h: synch_process_termsig new variable.
+
+	* callproc.c: Define synch_process_termsig.
+	(Fcall_process): Initiate synch_process_termsig to zero and
+	check if non-zero and get signal name after subprocess has ended.
+
+	* process.c (sigchld_handler): Set synch_process_termsig
+	if terminated by a signal.  synch_process_death setting removed.
+
+	* sysdep.c (mkdir, rmdir): Also check synch_process_termsig.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* print.c (print_preprocess): Declare size as EMACS_INT to not
+	lose bits.
+	(print_object): Likewise.
+	* alloc.c (Fpurecopy): Likewise.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* window.c (Fwindow_minibuffer_p): Doc fix.
+
[phone]  Jonathan Yavner  <[e-mail]>
+
+	* editfns.c (Fformat): Make both passes accept the same set of flags.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (Fmd5): If OBJECT is a buffer different from the current
+	one, set buffer to OBJECT temporarily.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_gcpro): Remove.
+	(kbd_buffer_store_event, clear_event, Fdiscard_input)
+	(stuff_buffered_input, init_keyboard, syms_of_keyboard):
+	Don't initialize and/or maintain the variable any more.  It was made
+	redundant by my commit of 2003-06-15.
+
+	* lisp.h [USE_LSB_TAG && !DECL_ALIGN]: Signal an error.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* lisp.h: Add undef DECL_ALIGN.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* process.c (wait_reading_process_input) [SYNC_INPUT]:
+	Check interrupt_input_pending explicitly.
+
+	* lisp.h (QUIT) [SYNC_INPUT]: Check interrupt_input_pending as well.
+
+	* keyboard.c (handle_async_input): New fun,
+	extracted from input_available_signal.
+	(input_available_signal, reinvoke_input_signal): Use it.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* buffer.c (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
+
+	* lisp.h [USE_LSB_TAG]: Add definitions for Lisp_Object value
+	manipulation macros for when tags are in the lower bits.
+	(struct Lisp_Free) [USE_LSB_TAG]: Add padding.
+	(DECL_ALIGN): New macro.
+	(DEFUN): Use it.
+
+	* lisp.h [ENABLE_CHECKING]: Don't force union type.
+
+	* s/darwin.h (__attribute__): Remove outdated workaround.
+
+	* macterm.c (main) [USE_LSB_TAG]: Don't range check the ram.
+
+	* alloc.c (lisp_malloc, lisp_align_malloc) [USE_LSB_TAG]:
+	Don't check range of malloc address.
+	(pure_alloc) [USE_LSB_TAG]: Enforce alignment.
+
+	* process.c (wait_reading_process_input): Lisp_Object/int mixup.
+
+	* dired.c (Ffile_attributes): Lisp_Object/int mixup.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fontset_font_pattern): Fix previous change.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xdisp.c (Voverflow_newline_into_fringe)
+	(move_it_in_display_line_to, redisplay_internal)
+	(update_window_fringes, redisplay_window, display_line, window):
+	Add `#ifdef HAVE_WINDOW_SYSTEM' around fringe-drawing stuff, so
+	that it compiles without a window-system.
+	* dispnew.c (direct_output_for_insert, update_window): Likewise.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* buffer.h (struct buffer): New member indicate_buffer_boundaries.
+
+	* buffer.c (init_buffer_once): Set buffer_defaults and
+	buffer_local_flags for indicate_buffer_boundaries.
+	(syms_of_buffer): Defvar_per_buffer it, and defvar_lisp_nopro
+	default- variable for it.
+
+	* dispextern.h (struct glyph_row): New members left_fringe_bitmap,
+	right_fringe_bitmap, redraw_fringe_bitmaps_p for new fringe handling.
+	New members exact_window_width_line_p and cursor_in_fringe_p for
+	overflowing newlines into right fringe.
+	New members indicate_bob_p, indicate_top_line_p, indicate_eob_p,
+	and indicate_bottom_line_p for buffer boundaries and scrolling.
+	(enum fringe_bitmap_type): Add UP_ARROW_BITMAP, DOWN_ARROW_BITMAP,
+	FIRST_LINE_BITMAP, LAST_LINE_BITMAP, FILLED_BOX_CURSOR_BITMAP,
+	HOLLOW_BOX_CURSOR_BITMAP, BAR_CURSOR_BITMAP, HBAR_CURSOR_BITMAP,
+	and HOLLOW_SQUARE_BITMAP.
+	(draw_fringe_bitmap, draw_window_fringes, update_window_fringes):
+	Add prototypes.
+
+	* dispnew.c (row_equal_p, update_window_line): Compare fringe bitmaps
+	instead of related indicator fields.
+	Compare exact_window_width_line_p and cursor_in_mouse_face_p indicators.
+	(direct_output_for_insert): Handle exact width lines like
+	contined lines.  Call update_window_fringes.
+	(update_window): Call update_window_fringes.
+	(scrolling_window): Don't skip desired rows with changed bitmaps.
+	Check if fringe bitmaps changes when assigning scrolled rows.
+
+	* xdisp.c (Voverflow_newline_into_fringe): New variable.
+	(IT_OVERFLOW_NEWLINE_INTO_FRINGE): New macro.
+	(move_it_in_display_line_to): Overflow newline into fringe for
+	rows that are exactly as wide as the window.
+	(up_arrow_bits, down_arrow_bits, first_line_bits, last_line_bits)
+	(filled_box_cursor_bits, hollow_box_cursor_bits, bar_cursor_bits)
+	(hbar_cursor_bits, hollow_square_bits): New fringe bitmaps.
+	(fringe_bitmaps): Add new bitmaps.
+	(draw_fringe_bitmap): Make extern.  Remove WHICH arg.
+	Select proper bitmap for cursor in fringe when appropriate.
+	Handle alignment of bitmap to top or bottom of row.
+	(draw_row_fringe_bitmaps): Don't select bitmaps here; that is now
+	done by update_window_fringes.
+	(update_window_fringes, draw_window_fringes): New functions.
+	(redisplay_internal): Call update_window_fringes in case only
+	cursor row is updated.
+	(redisplay_window): Call update_window_fringes.
+	Explicitly call draw_window_fringes if redisplay was done using
+	the current matrix or the overlay arrow is in the window.
+	(try_window_reusing_current_matrix): Mark scrolled rows for
+	fringe update (to update buffer-boundaries / scrolling icons).
+	(find_last_unchanged_at_beg_row): Handle exact width lines line
+	continued lines.
+	(display_line): Overflow newline into fringe for rows that are
+	exactly as wide as the window.  Don't append space for newline
+	in this case.
+	(notice_overwritten_cursor): Explicitly clear cursor bitmap
+	in fringe as if it had been overwritten.
+	(erase_phys_cursor): Erase cursor bitmap in fringe.
+	(syms_of_xdisp): Mark show-trailing-whitespace and
+	void-text-area-pointer as user options.
+	DEFVAR_LISP Voverflow_newline_into_fringe.  Enable by default.
+
+	* xterm.c (x_update_window_end): Call draw_window_fringes.
+	(x_after_update_window_line): Just set redraw_fringe_bitmaps_p
+	in row instead of actually drawing fringe bitmaps.
+	(x_draw_fringe_bitmap): Handle bottom aligned bitmaps.
+	(x_draw_window_cursor): Draw cursor in fringe.
+
+	* w32term.c (x_update_window_end): Call draw_window_fringes.
+	(x_after_update_window_line): Just set redraw_fringe_bitmaps_p
+	in row instead of actually drawing fringe bitmaps.
+	(w32_draw_fringe_bitmap): Handle bottom aligned bitmaps.
+	(w32_draw_window_cursor): Draw cursor in fringe.
+
+	* macterm.c (x_update_window_end): Call draw_window_fringes.
+	(x_after_update_window_line): Just set redraw_fringe_bitmaps_p
+	in row instead of actually drawing fringe bitmaps.
+	(x_draw_fringe_bitmap): Handle bottom aligned bitmaps.
+	(mac_draw_window_cursor): Draw cursor in fringe.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): Don't handle characters that are part
+	of an old style (XLookupString) compose sequence.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* search.c (Freplace_match): Use make_multibyte_string or
+	make_unibyte_string according to the buffer multibyteness.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (struct interval_block, struct string_block)
+	(struct symbol_block, struct marker_block, live_string_p)
+	(live_cons_p, live_symbol_p, live_float_p, live_misc_p):
+	Better preserve alignment for objects in blocks.
+	(FLOAT_BLOCK_SIZE): Adjust for possible alignment padding.
+
+	* lread.c (defvar_per_buffer): Remove dead declaration.
+
+	* macterm.c (do_check_ram_size): Don't hardcode the lisp address
+	space size.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Check new parameter down_on_keypress
+	if a key press should pop down.  Only pop down if a key is pressed
+	outside the menu/dialog.
+	(create_and_show_popup_menu): Pass 0 for down_on_keypress to
+	popup_get_selection.
+	(create_and_show_dialog): Pass 1 for down_on_keypress to
+	popup_get_selection.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* alloc.c (allocate_vectorlike): Surround calls to mallopt with
+	BLOCK/UNBLOCK_INPUT.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
+	specified.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* editfns.c (Fformat): Fix '&' to '&&'.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* print.c (print_preprocess) <case Lisp_Vectorlike>: Only mask
+	size if PSEUDOVECTOR_FLAG is set.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* charset.c (Fdeclare_equiv_charset): Fix docstring.
+
+	* fontset.c (fontset_ref_via_base): Fix previous change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (read_process_output): Only activate adaptive
+	buffering if we read less than 256 bytes at a time.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (buffer_posn_from_coords): Return both buffer/string
+	object and image object.  Return glyph width and height.
+	(mode_line_string, marginal_area_string): Ditto.
+
+	* dispextern.h (buffer_posn_from_coords, mode_line_string)
+	(marginal_area_string): Fix prototypes.
+
+	* keyboard.h (POSN_POSN, POSN_SET_POSN): Rename macros from
+	POSN_BUFFER_POSN and POSN_SET_BUFFER_POSN.  All uses changed.
+	(POSN_INBUFFER_P, POSN_BUFFER_POSN): New macros.
+
+	* keyboard.c (make_lispy_position): Use modified mode_line_string,
+	buffer_posn_from_coords, and marginal_area_string functions to
+	include both string object and image object in the lispy position.
+	Also add actual glyph width and height to position.
+	(read_key_sequence): Use real buffer position from mouse
+	event to find keymap property even when click is in marginal area.
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Use modified
+	mode_line_string and marginal_area_string functions to handle
+	both string object and image object properties.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* syntax.c (skip_chars): Treat '-' at end of string as ordinary
+	character.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* macterm.c (emacs_options, x_initialized, same_x_server):
+	Remove unused (and duplicated) definitions.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.h (struct Lisp_Process): New members for adaptive read
+	buffering: adaptive_read_buffering, read_output_delay, and
+	read_output_skip.
+
+	* process.c (ADAPTIVE_READ_BUFFERING): New conditional.
+	(READ_OUTPUT_DELAY_INCREMENT, READ_OUTPUT_DELAY_MAX)
+	(READ_OUTPUT_DELAY_MAX_MAX): New constants.
+	(process_output_delay_count, process_output_skip): New vars.
+	(Vprocess_adaptive_read_buffering): New variable.
+	(make_process): Initialize adaptive read buffering members.
+	(Fstart_process): Set adaptive_read_buffering member.
+	(deactivate_process): Cleanup adaptive read buffering.
+	(wait_reading_process_input): Temporarily omit delayed
+	subprocesses from the set of file descriptors to read from;
+	adjust the select timeout if we skipped any subprocesses.
+	(read_process_output): Increase adaptive read buffering delay if
+	we read less than a full buffer; reduce delay when we read a
+	full buffer.
+	(send_process): Simplify using local Lisp_Process var.
+	Reset adaptive read buffering delay after write.
+	(init_process): Initialize process_output_delay_count and
+	process_output_skip.
+	(syms_of_process): DEFVAR_LISP Vprocess_adaptive_read_buffering.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (w32_text_out): Use s->font, for consistency with callers.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* print.c (Ferror_message_string): Add hyperlink in the docstring
+	to the definition of `signal' in the Elisp manual.
+	* eval.c (Fsignal): Ditto.
+
[phone]  James Clark  <[e-mail]>
+
+	* fns.c (internal_equal): Return t for two NaN arguments.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* data.c (store_symval_forwarding): Handle setting
+	default-fill-column, etc., by changing the value in
+	buffers that use the default.
+
+	* minibuf.c (Fset_minibuffer_window): Doc fix.
+
+	* fileio.c (choose_write_coding_system): Ignore auto_saving
+	if using the visited file for auto saves.
+	(Fwrite_region): Don't update SAVE_MODIFF
+	if auto-saving in visited file.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* dispextern.h (face_font_available_p): Extern it.
+
+	* fontset.c (Voverriding_fontspec_alist): New variable.
+	(lookup_overriding_fontspec): New function.
+	(fontset_ref_via_base): Call lookup_overriding_fontspec if necessary.
+	(fontset_font_pattern): Likewise.
+	(regulalize_fontname): New function.
+	(Fset_fontset_font): Call regulalize_fontname.
+	(Fset_overriding_fontspec_internal): New function.
+	(syms_of_fontset): Initialize and staticpro Voverriding_fontspec_alist.
+	Defsubr Sset_overriding_fontspec_internal.
+
+	* xfaces.c (face_font_available_p): New function.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fother_buffer): Don't crash if BUF is nil
+	or if its name is nil.
+
+	* buffer.c (Fkill_buffer): Don't delete auto-save file
+	if it's the same as the visited file.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* coding.c (Fcheck_coding_system): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* Makefile.in (eval.o): Depend on dispextern.h.
+
+	* dispnew.c (buffer_posn_from_coords): Fix calculation of dy for
+	image glyph using image's ascent.
+	(mode_line_string): Return image glyph as object clicked on.
+	Adjust y0 for image glyph using image's ascent.
+
+	* dispextern.h (FACE_ID_BITS, MAX_FACE_ID): New defines.
+	(struct glyph): New members, ascent and descent.  Used to save
+	this glyph's ascent and descent, instead of having.
+	(struct glyph): Declare member face_id using FACE_ID_BITS.
+	(find_hot_spot): Add prototype.
+
+	* keyboard.c (Qimage): Remove extern (now in lisp.h).
+	(QCmap): Declare extern.
+	(make_lispy_position): When position is inside image hot-spot,
+	use hot-spot element's id as posn element.
+
+	* lisp.h (IMAGEP): New macro to test for image object type.
+	(Qimage): Declare extern.
+
+	* macfns.c (Qimage): Remove extern (now in lisp.h).
+	(valid_image_p, parse_image_spec): Use IMAGEP macro.
+
+	* macterm.c (Qface, Qmouse_face): Remove unused externs.
+
+	* w32fns.c (Qimage): Remove extern (now in lisp.h).
+	(valid_image_p, parse_image_spec): Use IMAGEP macro.
+
+	* w32menu.c (Qmouse_click, Qevent_kind): Remove unused externs.
+
+	* w32term.c (Qface, Qmouse_face): Remove unused externs.
+
+	* xdisp.c (Qarrow, Qhand, Qtext, Qpointer): New variables for
+	pointer types.
+	(Qrelative_width, Qalign_to): Remove unused variables.
+	(Vvoid_text_area_pointer): Replace Vshow_text_cursor_in_void.
+	(QCmap, QCpointer, Qrect, Qcircle, Qpoly): New variables for
+	image maps.
+	(x_y_to_hpos_vpos): Return glyph relative coordinates through
+	new dx and dy args.
+	Remove buffer_only_p arg (always 0).  Simplify code accordingly.
+	(get_glyph_string_clip_rect): Draw cursor using glyph's rather
+	than row's ascent and height, to get sensible height on tall rows.
+	(build_desired_tool_bar_string): Remove Qimage extern.
+	(get_tool_bar_item): Fix call to x_y_to_hpos_vpos.
+	(produce_image_glyph): Adjust it.ascent to minimum row ascent if
+	image glyph is alone on the last line.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Set glyph's ascent and descent.
+	(on_hot_spot_p): New function to check if position is inside an
+	rectangular, circular, or polygon-shaped image hot-spot,
+	(find_hot_spot): New function to search for image hot-spot.
+	(Flookup_image_map): New defun to search for image hot-spot.
+	(define_frame_cursor1): New aux function to determine frame pointer.
+	(note_mode_line_or_margin_highlight, note_mouse_highlight):
+	Handle `pointer' text property and :pointer image property to
+	control frame pointer shape.  Detect image hot-spots for pointer
+	and help_echo properties.  Use define_frame_cursor1.
+	(note_mouse_highlight):	Use Vvoid_text_area_pointer.
+	(syms_of_xdisp): Defsubr new defun.  Intern and staticpro new variables.
+	DEFVAR_LISP Vvoid_text_area_pointer instead of Vshow_text_cursor_in_void.
+
+	* xfaces.c (cache_face): Abort if c->size exceeds MAX_FACE_ID.
+
+	* xfns.c (x_set_mouse_color): Remove bogus x_check_errors call.
+	(Qimage): Remove extern (now in lisp.h).
+	(valid_image_p, parse_image_spec): Use IMAGEP macro.
+
+	* xmenu.c (show_help_event): Remove unused code.
+
+	* xterm.c (Qface, Qmouse_face): Remove unused externs.
+	(x_draw_hollow_cursor): Draw cursor using glyph's rather than
+	row's ascent and descent, to get a sensible height on tall rows.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* minibuf.c (Fcompleting_read): Undo previous change.
+
[phone]  Lars Hansen  <[e-mail]>
+
+	* dired.c (Fdirectory_files, Fdirectory_files_and_attributes):
+	Arguments GCPRO'ed in call to file name handler.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* termcap.c (tgetst1): Scan for "%pN"; if all
+	N are continuous in [1,9], remove all "%pN".
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_frame_set_char_size): Call x_wm_set_size_hint.
+
+	* xfaces.c (lface_fully_specified_p): Take into account that
+	MAC OS always have unspecified stipple.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* tparam.c (tparam1): Add handling for `%pN', which
+	means use param N for the next substitution.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* xfaces.c (Fcolor_gray_p): Fix omission bug:
+	In case `frame' is nil, consult the selected frame.
+	(Fcolor_supported_p): Likewise.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Frandom, Fstring_make_multibyte, Fset_char_table_range):
+	Doc fixes.
+
+	* minibuf.c (read_minibuf): Allow INITIAL to be a cons of a string
+	and an integer.  Adapt the introductory comment accordingly.
+	(Fread_from_minibuffer): Delete code moved into read_minibuf.
+	Doc fix.
+	(Fread_minibuffer, Fread_no_blanks_input): Adapt to changes in
+	read_minibuf.
+	(Fcompleting_read): Delete code moved into read_minibuf.
+	(Ftest_completion): Make it handle obarrays and hash tables correctly.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (decode_coding_iso2022): Fix for preserving UTF-8
+	encoding sequence.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* composite.c (syms_of_composite): Don't make the compostion hash
+	table week.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* intervals.h: Add EXFUN for Fget_char_property_and_overlay.
+	* textprop.c (Fget_char_property_and_overlay): New function.
+	(syms_of_textprop): Defsubr it.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
+	to compile on terminal configuration.
+
+	* fileio.c (Fread_file_name): Check use_file_dialog also before
+	calling Fx_file_dialog.
+
+	* fns.c (use_file_dialog): New variable.
+	(syms_of_fns): DEFVAR_BOOL use-file-dialog.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* msdos.c (Qcursor_type, Qbar, Qhbar): Declare extern.
+	(syms_of_msdos): Don't intern and staticpro them.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (buffer_posn_from_coords): Calculate and return pixel
+	coordinates relative to glyph at posn.  If glyph is an image,
+	return that as object at posn.  Callers changed.
+	(mode_line_string, marginal_area_string): Calculate and return
+	pixel coordinates relative to glyph.  Callers changed.
+
+	* dispextern.h (buffer_posn_from_coords, mode_line_string)
+	(marginal_area_string): Fix prototypes.
+	(window_box_left_offset, window_box_right_offset): Add prototypes.
+
+	* frame.h (get_specified_cursor_type, get_window_cursor_type):
+	Remove prototypes.
+
+	* keyboard.h (EVENT_CLICK_COUNT, POSN_SCROLLBAR_PART): Fix defines.
+
+	* keyboard.c (make_lispy_position): Add x and y coordinates
+	relative to the current glyph as 7th element of position.
+	If glyph is an image, return it in the object element.
+	(read_key_sequence): Skip checks for keymap property in cases
+	where POSN_STRING is not a string (e.g. an image).
+
+	* xdisp.c (Vdisplay_pixels_per_inch): New variable.
+	(Vshow_text_cursor_in_void): New variable.
+	(glyph_to_pixel_coords): Don't use negative hpos.
+	(x_y_to_hpos_vpos): Fix for partially visible first glyph.
+	(append_stretch_glyph): Change ascent arg to be actual value
+	in pixels rather than ratio to height.  Callers changed.
+	(calc_pixel_width_or_height): New aux function, implementing
+	pixel based artihmetic for glyph widths and heights.
+	(produce_stretch_glyph): Use calc_pixel_width_or_height for
+	:width, :height, :align-to, and :ascent, thus allowing these to
+	be specified in pixels as well as multiples of characters.
+	Don't produce stretch glyphs with zero width or height.
+	(get_specified_cursor_type): Declare static.
+	(get_window_cursor_type): Declare static.  Add glyph arg to be
+	able to know when cursor is on an image; always substitute
+	hollow-box cursor for filled-box cursor on images, to avoid
+	negative images and flicker when blinking the cursor.
+	(display_and_set_cursor): Pass glyph to	get_window_cursor_type.
+	(note_mode_line_or_margin_highlight): Use non-text cursor rather
+	than vertical scroll-bar cursor in display margins.
+	(note_mouse_highlight): Use non-text cursor rather than text
+	cursor in fringes and over images in the text area.
+	Use non-text cursor when mouse pointer is outside editable text,
+	i.e. in the void after end-of-line or end-of-buffer; this was
+	already done for W32, but is now standard for all systems --
+	user can toggle show-text-cursor-in-void to get old behaviour.
+	(syms_of_xdisp): DEFVAR_LISP Vshow_text_cursor_in_void and
+	Vdisplay_pixels_per_inch.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* fns.c (internal_equal) <case Lisp_Vectorlike>: Declare size as
+	EMACS_INT to not lose bits.
+	(Ffillarray): Don't set bits beyond the size of a bool vector.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* print.c (Fredirect_debugging_output) [!GNU_LINUX]: Do not
+	define this defun on systems that cannot use stderr as lvalue.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS)
+	[__FreeBSD_version >= 500042]: Define as -znocombreloc because
+	ld's default is incompatible with unexec.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS.
+	(window_loop): Handle REDISPLAY_BUFFER_WINDOWS.
+	(Fforce_window_update): New defun.
+	(syms_of_window): Defsubr it.
+	(Fset_window_margins, Fset_window_fringes): Doc fix.
+
+	* print.c (Fredirect_debugging_output): New defun.
+	(syms_of_print): Defsubr it.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Fset_char_table_parent): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (buffer_posn_from_coords): Return actual row/column
+	for glyph clicked on, rather than (unused) pixel positions.
+	(mode_line_string, marginal_area_string): Change X and Y args to
+	pointers for returning actual row/column for glyph clicked on.
+	Simplify and optimize loops.
+
+	* dispextern.h (mode_line_string, marginal_area_string):
+	Update prototypes.
+
+	* keyboard.c (make_lispy_position): New function for generating
+	mouse click positions from frame and pixel coordinates.
+	Enhanced to return buffer position and actual row/column for
+	events outside the text area using updated mode_line_string and
+	marginal_area_string functions.
+	Return left-fringe and right-fringe clicks as such, rather than
+	clicks in text area.
+	(make_lispy_event) [USE_X_TOOLKIT, USE_GTK]: Don't call
+	pixel_to_glyph_coords, as we never use the results.
+	(make_lispy_event): Use make_lispy_position for MOUSE_CLICK_EVENT,
+	WHEEL_EVENT, and DRAG_N_DROP_EVENT to replace redundant code.
+	Eliminate unused code in WHEEL_EVENT handling.
+	(make_lispy_movement): Use make_lispy_position.
+
+	* window.c (coordinates_in_window): Remove redundant tests.
+	Fix returned X pixel value for left-margin.
+
+	* xdisp.c (note_mode_line_or_margin_highlight): Adapt to new
+	mode_line_string and marginal_area_string parameters.
+
[phone]  Lars Hansen  <[e-mail]>
+
+	* w32.c (struct the_group, getgrgid): Add.
+	* mac.c (struct my_group, getgrgid): Add.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Fassq, Fassoc, Frassq, Frassoc): Doc fixes.
+
[phone]  Lars Hansen  <[e-mail]>
+
+	* dired.c (Ffile_attributes): Add parameter ID-FORMAT and
+	include in call to file name handler.  Optionally translate numeric
+	UID and GID to strings.  Update docstring.
+	(directory_files_internal): Add parameter ID-FORMAT.
+	(Fdirectory_files_and_attributes): Add parameter ID-FORMAT and
+	include in call to file name handler and call to
+	directory_files_internal.  Update Docstring.
+	(Fdirectory_files): Add dummy parameter in call to
+	directory_files_internal.
+	* lisp.h (Qinteger): Add.
+	(Qinteger_or_floatp, Qinteger_or_float_or_marker_p): Remove.
+	(Ffile_attributes): Add parameter.
+	* data.c (Qinteger): Export.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Freverse, Fnreverse): Doc fixes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (init_iterator): Initialize it->start to position
+	before reseating (in case start position is invisible).
+	(init_to_row_start): Set it->start to row-start.
+	(redisplay_window): Accept optional_new_start if start position
+	is invisible (in which case IT_CHARPOS overshoots PT).
+	(display_line): Setup row->start from it->start (rather than
+	it->current which is wrong if first char on line is invisible).
+	When done, reseat it->start to it->current (= start of next row).
+	(expose_area): Fix exposure of text area when first char (e.g. TAB)
+	is only partially visible.
+
+	* dispextern.h (struct it): New member start.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (make_float, Fcons): Clear the markbit at init time.
+	(make_float, Fcons, Fmake_symbol, allocate_misc): Move the increment
+	of block_index outside of the macro call.
+	(Fgarbage_collect): Remove null code.
+
+	* m/amdx86-64.h: Don't redefine XPNTR.
+
+	* keyboard.c (parse_modifiers, apply_modifiers): Use INTMASK instead
+	of VALMASK.
+
+	* fns.c (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
+	(sxhash_string, sxhash): Use INTMASK instead of VALMASK.
+	(maybe_resize_hash_table): Use MOST_POSITIVE_FIXNUM.
+
+	* lisp.h (VALMASK): Only define for non-union type.
+	(MARKBIT): Remove.
+	(ARRAY_MARK_FLAG): Use previous value of MARKBIT.
+	(XTYPE): Define unconditionally.
+	(XSETTYPE): Remove one more remnant.
+	(EQ): Define differently for the union and non-union cases.
+	(INTMASK): New bit mask.
+	(struct Lisp_Marker): Move down to prepare for upcoming patch.
+	(GC_EQ): Delegate to EQ.
+
+	* coding.c (coding_restore_composition): Lisp_Object/int mixup.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_window_to_scroll_bar): Move check of display to
+	where window_id is compared.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispextern.h (struct it): New member first_vpos.
+
+	* xdisp.c (start_display): Set it->first_vpos.
+	(try_window_id): Use first_vpos to start display in first _text_
+	line if no reusable lines at start of window with header line.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* w32fns.c (XPutPixel):
+	* w32bdf.c (w32_init_bdf_font):
+	* sunfns.c (sel_read):
+	* process.c (Fmake_network_process):
+	* frame.c (store_frame_param):
+	* fontset.c (Fset_fontset_font):
+	* emacs.c (shut_down_emacs):
+	* ccl.c (ccl_driver): Remove period at end of error message.
+
+	* config.in: Regenerate.
+
+	* xfns.c (x_window_to_frame, x_any_window_to_frame)
+	(x_non_menubar_window_to_frame, x_menubar_window_to_frame)
+	(x_top_window_to_frame): Add Display* argument to xg_win_to_widget.
+	(x_create_bitmap_mask, xg_set_icon, create_frame_xic)
+	(xic_set_statusarea, x_window, gif_load): Formatting adjustments.
+
+	* xterm.h (struct x_display_info): New field xg_cursor for GTK.
+
+	* xterm.c: Add Display * to x_window_to_scroll_bar declaration.
+	(XTmouse_position, handle_one_xevent): Pass Display* to
+	x_window_to_scroll_bar.
+	(x_window_to_scroll_bar): Take a Display* argument.
+	Check that display for frame is equal to Display* argument.
+	(event_handler_gdk): Remove current_dpyinfo.  Get dpyinfo from
+	x_display_info_for_display instead.  Use Display in xev instead
+	of GDK_DISPLAY.
+	(x_dispatch_event): Call x_display_info_for_display.
+	(XTread_socket): Move GTK part out of loop.  current_dpyinfo removed.
+	(x_connection_closed): Call xg_display_close for GTK.
+	(x_term_init): Call xg_display_open for additional displays.
+	Initiate dpyinfo->xg_cursor with call to xg_create_default_cursor
+	for GTK.
+
+	* xmenu.c (single_menu_item, mouse_position_for_popup)
+	(x_activate_menubar): Formatting adjustments.
+
+	* xdisp.c (update_tool_bar, redisplay_tool_bar): Formatting
+	adjustments.
+
+	* gtkutil.c (xg_get_gdk_display, xg_set_screen, xg_display_open)
+	(xg_display_close, xg_create_default_cursor)
+	(xg_get_gdk_pixmap_and_mask): New functions for multiple display
+	handling.
+	(xg_left_ptr_cursor): Remove.
+	(xg_set_cursor): Change cursor to GdkCursor*.  Do not create
+	cursor here.
+	(xg_win_to_widget): Take Display* argument, call
+	gdk_xid_table_lookup_for_display.
+	(xg_create_frame_widgets, xg_get_file_name, create_menus)
+	(xg_create_widget, xg_modify_menubar_widgets): Call xg_set_screen.
+	(xg_create_widget, xg_create_scroll_bar): Use xg_cursor
+	in FRAME_X_DISPLAY_INFO.
+	(xg_get_scroll_id_for_window): Take Display* argument.
+	(update_frame_tool_bar): Call xg_get_gdk_pixmap_and_mask.
+	(xg_initialize): Remove xg_left_ptr_cursor.
+
+	* gtkutil.h (xg_get_scroll_id_for_window, xg_win_to_widget): Add
+	Display* argument.
+	(xg_display_open, xg_display_close, xg_create_default_cursor): Declare.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_detect_focus_change): Do not change focus frame for
+	Enter/LeaveNotify if the current focus frame has explicit focus.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* dispnew.c (update_text_area): Fix redisplay error when hscroll
+	is active and first glyph is only partially visible.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (select_frame_for_redisplay): New function.
+	(redisplay_internal): Record also selected_frame for
+	unwind_redisplay.  Call select_frame_for_redisplay before
+	redrawing each frame.
+	(unwind_redisplay): Argument changed to a cons.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Fstring_to_multibyte): Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (x_window): Set XtNx and XtNy in shell widget for
+	program specified positions.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (XAW_ARROW_SCROLLBARS): Define it for Xaw 1.5E.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* Makefile.in (lisp): Add kannada.el.
+	(shortlisp): Likewise.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (coding_allocate_composition_data):
+	Reset coding->composing to COMPOSITION_NO.
+	(coding_restore_composition): Detect invalid composition data.
+	Give Fstring and Fvector a Lispy integer, not C int.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* floatfns.c (Flogb): Don't use VALMASK.
+
+	* m/amdx86-64.h (VALBITS, XINT, XUINT): Remove.
+	* m/ia64.h (VALBITS, XINT, XUINT): Remove.
+
+	* lisp.h (XINT): Move the cast to clarify what is going on.
+	(GCTYPEMASK, XSETTYPE): Remove.
+	(XGCTYPE): Make it an alias of XTYPE.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_term_init): Fix formatting.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.h (xg_have_tear_offs): Declare.
+	(xg_keep_popup, xg_did_tearoff): Remove.
+
+	* gtkutil.c: Remove variable xg_did_tearoff.
+	(xg_have_tear_offs): New function.
+	(tearoff_remove): Just decrease xg_detached_menus.
+	(tearoff_activate): Increase xg_detached_menus and call
+	tearoff_remove when tearoff is removed.
+	(xg_keep_popup): Remove function.
+	(create_menus): Give add_tearoff_p as argument to recursive
+	call to create_menus.
+	(xg_create_widget): Use variables instead of multiple
+	strcmp.  Tell create_menus to create tear off only for
+	menu bar menus.
+	(xg_update_menubar): Change title for a detached menu also.
+	(xg_modify_menubar_widgets): Always call xg_update_menubar, regardless
+	of deep_p.
+	(xg_initialize): Initialize xg_detached_menus, remove
+	initialization of xg_did_tearoff.
+
+	* xmenu.c (set_frame_menubar): For GTK, set deep_p if
+	xg_have_tear_offs returns non-zero.
+	(create_and_show_popup_menu): Remove setting of xg_did_tearoff and
+	call to xg_keep_popup.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (XTread_socket): Handle menubar selection and grow
+	window only for mouseDown events.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_term_init): For GTK part, increase x_initialized
+	to check for more than one display.  Use error instead of return 0.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* unexmacosx.c (unrelocate): New function (contributed by Nozomu Ando).
+	(copy_dysymtab): Call it.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* eval.c (Fdefvaralias): Doc fix.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* data.c (Fsetplist): Doc fix.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* window.c (Fset_window_fringes): Clarify docstring.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (Fset_window_margins): Simplify arg checking.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.c (MAX_BUF_SIZE): Reduce to 2**15.
+	(print_partial_compiled_pattern): Replace assert with a printout.
+	(skip_noops, mutually_exclusive_p): Change args, values to re_char *.
+
+	* alloc.c (lisp_align_malloc): If BASE is 0, call memory_full.
+
+	* window.c (Fset_window_margins): Allow only integers as args.
+	(syms_of_window) <special-display-buffer-names, special-display-regexps>:
+	Doc fixes.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* window.c (Fset_window_fringes): Elaborate docstring.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (XTread_socket): Call DragWindow only for mouseDown events.
+
+	* s/darwin.h (GC_MARK_STACK): Define.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* window.c (shrink_windows): New function.
+	(size_window): Call shrink_windows to calculate window sizes when
+	shrinking frame with more than one window.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (compute_fringe_widths): Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Fcoding_system_p): Return t for auto-loading coding system.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Qcoding_system_define_form): New variable.
+	(syms_of_coding): Intern and staticpro it.
+	(Fcheck_coding_system): Try to autoload the definition of
+	CODING-SYSTEM.
+
[phone]  Luc Teirlinck  <[e-mail]>
+
+	* fns.c (Frequire): Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (Fx_send_client_event): New function as a base for
+	manipulating extended window manager hints.
+	(Fx_send_client_event): Remove unused variable s.
+
+	* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,
+	that function is removed.
+
+	* xterm.c (x_set_offset): Use move_offset_left/top instead of
+	x/y_pixels_outer_diff.
+	(x_check_expected_move): Calculate move_offset_left/top.
+
+	* xterm.h (struct x_output): New members: move_offset_top/left.
+
+	* frame.c (x_set_frame_parameters): Remove x_fullscreen_move,
+	call x_set_offset directly.
+
+	* frame.h (enum): FULLSCREEN_MOVE_WAIT removed.
+
+	* frame.c (Fdelete_frame): Free decode_mode_spec_buffer.
+
+	* xterm.c (x_delete_display): Free font names and font_encoder
+	in dpyinfo->font_table.
+
+	* xfns.c (Fx_close_connection): Only call XFreeFont here.
+	Move xfree of font names to x_delete_display.
+
+	* xterm.h (struct x_display_info): New member, wm_type.
+	(struct x_output): New members, expected_top/left and
+	check_expected_move.
+
+	* xterm.c (handle_one_xevent): Reset wm_type when ReparentNotify
+	is received.
+	(handle_one_xevent): Rename x_check_expected_move from
+	x_check_fullscreen_move.
+	(x_set_offset): Only add WM decoration sizes to	modified_top/left
+	for X_WMTYPE_A.  Set check_expected_move when WM type is unknown.
+	(x_check_expected_move): Rename from x_check_fullscreen_move.
+	Removed fullscreen specific code.  Use check_expected_move,
+	expected_left/top instead.  Also, set wm_type.
+	(x_term_init): Initialize wm_type to unknown.
+
+	* frame.c (x_fullscreen_move): Remove addition of WM decoration
+	sizes to move_x/y.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* macterm.c (x_load_font): Clear all members of FONTP before start
+	filling them.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (fs_load_font): Don't set fontp->font_encoder to NULL
+	before calling find_ccl_program_func.  Call find_ccl_program_func
+	only when fontp->font_encoder is not NULL.
+
+	* xterm.c (x_load_font): Clear all members of FONTP before start
+	filling them.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* keymap.c (map_keymap): Don't abort when binding is a vector.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* makefile.w32-in (emacs.o, coding.o, bytecode.o):
+	Sync dependencies with Makefile.in.
+	(alloca.o): Remove.
+
+	* w32fns.c (w32_load_system_font): Clear all members of FONTP before
+	filling them.
+
+	* w32bdf.c (w32_load_bdf_font): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* term.c (set_tty_color_mode): Calculate current_mode_spec
+	regardless of value of VAL.
+
+	* intervals.c (graft_intervals_into_buffer):
+	Set BUF_INTERVALS (buffer)->up_obj when appropriate.
+	Handle over_used when splitting UNDER.
+
[phone]  YAMAMOTO  Mitsuharu  <[e-mail]>
+
+	* regex.c (regex_compile): Free the stack when returning from function.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (Finternal_char_font): Change return value to
+	cons (FONT-NAME . GLYPH-CODE).
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* term.c (tty_setup_colors): Treat any negative argument as -1.
+
[phone]  Gaute B Strokkenes  <[e-mail]>  (tiny change)
+
+	* process.c (send_process): Delete unused temp_buf.
+
[phone]  Dave Love  <[e-mail]>
+
+	* xterm.c (x_bitmap_mask): Declare.
+
[phone]  Dave Love  <[e-mail]>
+
+	* Makefile.in (fns.o): Depend on md5.h.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (set_window_buffer): Fix redisplay problems when
+	switching between buffers with different display margin widths.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (set_socket_option): Fix :bindtodevice option.
+	(Fset_network_process_option): Update process contact list when
+	setting option succeeds.
+	(Fmake_network_process): Doc fix.
+
[phone]  Dave Love  <[e-mail]>
+
+	* process.c (Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ... macros.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* term.c (set_tty_color_mode): Use INTEGERP to test whether a
+	color mode is an integer number (it could be -1).
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* intervals.c (graft_intervals_into_buffer): Correct the main loop
+	in the case where OVER is longer than UNDER.
+
[phone]  Masatake YAMATO  <[e-mail]>
+
+	* window.c (Fset_window_scroll_bars): Validate the value of
+	`vertical_type'.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* frame.c (Vdefault_frame_scroll_bars): New variable.
+	(x_set_vertical_scroll_bars): Use it instead of hardcoded values.
+	(syms_of_frame): DEFVAR_LISP it, and initialize according to
+	window-system default scroll bar position.
+
+	* window.c (Fwindow_scroll_bars): Doc fix.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_set_offset): Take window manager decorations into account.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* atimer.h: Don't include lisp.h.
+	(P_): Define it here (as well as elsewhere).
+
+	* print.c (Fprin1_to_string): Move the PRINTPREPARE
+	later, so that PRINTFINISH won't unbind Qinhibit_modification_hooks.
+
+	* data.c (Fvariable_binding_locus): New function.
+	(syms_of_data): defsubr it.
+	(Flocal_variable_p): Delete duplicate call to indirect_variable.
+
[phone]  Dave Love  <[e-mail]>
+
+	* alloc.c (GC_MALLOC_CHECK): Move conditional undef after lisp.h.
+
+	* process.c (Fnetwork_interface_info): Fix type error.
+	(Fnetwork_interface_list): Doc fix.
+	(read_process_output, read_process_output): Delete unused var.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fnetwork_interface_list, Fnetwork_interface_info):
+	Require HAVE_NET_IF_H and HAVE_SYS_IOCTL_H to include these fns.
+	(Fnetwork_interface_info): Check that ifreq struct has required
+	fields before accessing them; this requires that those fields are
+	defined as macros, which may be too restrictive on some platforms,
+	but it is better than failing on other platforms.
+	(syms_of_process): Only defsubr above fns when included.
+
[phone]  Dave Love  <[e-mail]>
+
+	* unexalpha.c: Don't include varargs.h.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fset_process_sentinel): Add sentinel to childp plist
+	for network process.
+	(socket_options): Add `:' prefix to option names.  Add optbit field.
+	(set_socket_option): Remove no_error arg and special handling of s < 0.
+	Return 1<<optbit for known option, 0 for unknown.
+	Do not interpret 0 as false for boolean option (only nil).
+	Pass failed option and value to report_file_error.
+	(Fset_network_process_options): Replace by Fset_network_process_option.
+	(Fset_network_process_option): New function to set just one option.
+	(Fmake_network_process): Allow :coding arg to be a cons.
+	Allow :server arg to be an integer specifying backlog size.
+	Remove :options arg, and allow options to be specified directly
+	as :KEY, VALUE pairs.  Parse these options before binding socket.
+	As before, :reuseaddr t is default for a server process, but this
+	can now be disabled by specifying :reuseaddr nil.
+	(Fnetwork_interface_info): Rename from Fget_network_interface_info.
+	(init_process): Availability of network options is now checked with
+	simpler syntax (featurep 'make-network-process :OPTION); use loop to
+	setup features.
+	(syms_of_process): Fix defsubr's for the replaced functions.
+
[phone]  Dave Love  <[e-mail]>
+
+	* Makefile.in: Depend on coding.h.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c [HAVE_SOCKETS]: Include sys/ioctl.h and net/if.h.
+	(Fnetwork_interface_list, Fget_network_interface_info): New defuns.
+	(syms_of_process): Defsubr them.
+
+	* config.in: Regenerate.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* m/sr2k.h (XMARKBIT, XUNMARK): Remove.
+	* m/news-r6.h (XUNMARK): Remove.
+	* m/mips.h (XUNMARK): Remove.
+	* m/mips-siemens.h (XUNMARK): Remove.
+	* m/iris4d.h (XUNMARK): Remove.
+	* m/hp800.h (XMARKBIT, XUNMARK): Remove.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (VALBITS): Don't remove 1 for the markbit.
+	(union Lisp_Object): Use unsigned int for types.  Remove markbit.
+	(MARKBIT): Remove 1 from VALBITS so we still use same old val.
+	(XTYPE): Use unsigned right-shift.
+	(XMARKBIT, XMARK, XUNMARK): Remove.
+
+	* alloc.c (init_intervals, init_symbol, init_marker):
+	Don't preallocate anything.
+	(Fgarbage_collect, mark_object): Ignore the markbit.
+
+	* bytecode.c (mark_byte_stack, unmark_byte_stack): Ignore the markbit.
+
[phone]  Lute Kamstra  <[e-mail]>
+
+	* xdisp.c (pint2hrstr): New function.
+	(decode_mode_spec): Add `%i' and `%I' specs.
+	* buffer.c (syms_of_buffer): Document `%i' and `%I' constructs
+	for `mode-line-format'.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* alloc.c: Use long instead of int when casting ABLOCKS_BUSY to
+	avoid warning.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* editfns.c (region_limit): Support any non-zero value of BEGINNINGP.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_window_cursor_type): Partially undo 2002-03-01
+	change (superseded by 2002-08-30 change); the default blink-off
+	cursor is now again "no cursor".
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* makefile.w32-in (alloca.o): Remove.
+	(coding.o): Depend on intervals.h
+	(emacs.o, bytecode.o): Depend on window.h
+
[phone]  Dave Love  <[e-mail]>
+
+	* Makefile.in (alloca.o): Remove commands.
+	(coding.o): Depend on intervals.h composite.h window.h.
+	(emacs.o): Depend on window.h keyboard.h keymap.h.
+	(gtkutil.o): Depend on keyboard.h charset.h coding.h.
+	(bytecode.o): Depend on window.h.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (w32_per_char_metric): Allow cached metrics to be
+	returned even when font_type is unknown.
+
+	* xdisp.c (init_iterator): Remove old WINDOWSNT conditional.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_term_init): Initialize new fields in x_display_info.
+
+	* xterm.h (struct x_display_info): Add red/green/blue_bits and
+	*_offset.
+
+	* xfns.c (lookup_rgb_color): Use new fields in x_display_info to
+	calculate pixel value.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (redisplay_internal): Fix change of 2003-04-30.
+	Don't tell redisplay display is accurate when it's actually been
+	paused for pending input.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* dispnew.c (adjust_glyph_matrix): Call window_box
+	whenever W is nonzero.
+
+	* data.c (Fmake_variable_buffer_local, Fmake_local_variable)
+	(Fkill_local_variable, Fmake_variable_frame_local)
+	(Flocal_variable_p, Flocal_variable_if_set_p):
+	Use indirect_variable to trace thru variable aliases.
+
+	* config.in: Updated.
+
+	* callint.c (Fcall_interactively): Save and restore
+	Vthis_command, Vthis_original_command, real_this_command,
+	and current_kboard->Vlast_command.
+
+	* abbrev.c (Fexpand_abbrev): Insert before deleting.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xfns.c (lookup_rgb_color): Handle TrueColor visuals specially.
+
[phone]  David Abrahams  <[e-mail]>  (tiny change)
+
+	* coding.c (decode_coding_iso2022): Initialize local variable c2.
+	(decode_coding_sjis_big5): Likewise.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32.c (sys_pipe): Protect against file descriptor overflow.
+
+	* w32fns.c (syms_of_w32fns): Remove non-existent functions.
+
+	* w32term.c (w32_read_socket): Fix WM_MOUSEWHEEL assignment.
+
[phone]  Terje Rosten  <[e-mail]>
+
+	* xfns.c (Vgtk_version_string): New variable.
+	(syms_of_xfns): DEFVAR_LISP it.  Provide gtk.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* term.c (term_init): Remove `const' from buffer_size's declaration.
+
+	* Makefile.in (msdos.o): Depend on intervals.h.
+
+	* msdos.c: Include intervals.h, since STRING_INTERVALS requires that.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h (struct x_display_info): New fields: client_leader_window
+	and Xatom_wm_client_leader.
+
+	* xterm.c (x_initialize): Move call to x_session_initialize to ...
+	(x_term_init): ... here.  Initialize client_leader fields in dpyinfo.
+
+	* xsmfns.c (create_client_leader_window): New function.
+	(x_session_initialize): Call create_client_leader_window, take
+	dpyinfo as argument.
+
+	* xfns.c (Fx_create_frame): Set property WM_CLIENT_LEADER.
+
+	* Makefile.in (xsmfns.o): Add more depenedencies.
+
[phone]  Dave Love  <[e-mail]>
+
+	* m/iris4d.h: Use _MIPS_SZLONG, not _LP64.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* term.c (term_init): Fix previous change; don't rely on the
+	length of `buffer' if TERMINFO is defined.
+
[phone]  Dave Love  <[e-mail]>
+
+	* atimer.h: Include lisp.h.
+
+	* lisp.h (EMACS_LISP_H): New.
+	(popup_activated_flag): Don't declare.
+
+	* alloca.c: Some merging with gnulib.  Change logic and doc
+	concerning (x)malloc/(x)free -- no longer Emacs-specific.
+	[DO_BLOCK_INPUT]: Don't include lisp.h.
+	(xmalloc, xfree): Declare.
+	(malloc): Don't declare.
+
+	* Makefile.in (LWLIB_OPTIONS): Remove (unused).
+	(alloca.o): Remove obsolete stuff concerning alloca.s.  Depend on
+	atimer.h, blockinput.h.
+
+	* alloc.c (lisp_align_malloc): Change type of `aligned'.
+
+	* alloca.s: Remove.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/freebsd.h [__FreeBSD_version >= 400000]: Define TERMINFO,
+	use -lncurses.
+
+	* term.c (term_init): Use a buffer of size 4096 for tgetent since
+	FreeBSD returns something longer than 2044.  Abort if the end of
+	the buffer is overwritten.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xterm.c (x_term_init): Correctly use result of Ffile_readable_p.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* alloc.c (lisp_align_malloc): Check for memory full when
+	allocating ablocks, which also avoids freeing a pointer into an
+	ablocks structure.
+
+	* puresize.h (BASE_PURESIZE): Increase to 1100000.
+
+	* buffer.c (Fmove_overlay): Set overlay's next pointer unconditionally.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fencode_time): Doc fix.
+
[phone]  David Ponce  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Fix conditional expression to issue
+	the right message.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* syntax.c (Fforward_word): Argument changed to optional.
+	Set default value to 1.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xfaces.c (better_font_p): Prefer a real scalable font; i.e. not
+	what autoscaled.
+	(best_matching_font): Once we find a better scalable font, set
+	non_scalable_has_exact_height_p to 1.
+	(try_font_list): Call try_alternative_families to try any family
+	with the given registry.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* alloc.c (mark_object): Handle Lisp_Misc_Save_Value.
+
+	* print.c (print_string): Fix printing of multibyte string with
+	nontrivial printcharfun.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
+
+	* xterm.c (x_bitmap_icon): Return if xg_set_icon succeeds.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* process.c (read_process_output): Return the actually read bytes
+	instead of the result of decoding.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xterm.h (struct x_bitmap_record): New member have_mask.
+
+	* xfns.c (x_create_bitmap_from_data): Initialize have_mask member
+	to 0.
+	(x_create_bitmap_from_file): Likewise.
+	(x_destroy_bitmap): Check have_mask member before freeing a mask.
+	(x_destroy_all_bitmaps): Likewise.
+	(x_create_bitmap_mask): Set have_mask member to 1.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* Makefile.in (CFLAGS) [!OPTIMIZE]: Undo previous change.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_mark_data): Update calls to mark_object.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (xim_open_dpy, xim_initialize, xim_close_dpy):
+	Conditionalize XIM code on HAVE_XIM.
+
+	* fns.c (Fclear_string): New function.
+	(syms_of_fns): defsubr it.
+
[phone]  KOBAYASHI Yasuhiro  <[e-mail]>
+
+	* xfns.c (xic_set_preeditarea): Add the left fringe width to spot.x.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfns.c: Don't check HAVE_PNG_H: autoconf doesn't seem to find it.
+
+	* buffer.c (delete_all_overlays): New function.
+	* buffer.h (delete_all_overlays): Declare.
+	* coding.c (run_pre_post_conversion_on_str):
+	* print.c (temp_output_buffer_setup):
+	* fileio.c (Finsert_file_contents):
+	* minibuf.c (get_minibuffer): Use it.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* unexmacosx.c (unexec_regions_sort_compare):
+	(unexec_regions_merge): New functions.  Sort and merge unexec
+	regions before dumping them.
+
[phone]  Dave Love  <[e-mail]>
+
+	* xfns.c [HAVE_PNG]: Consider both png.h and libpng/png.h.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (MARK_STRING, UNMARK_STRING, STRING_MARKED_P)
+	(GC_STRING_CHARS, string_bytes): Use ARRAY_MARK_FLAG rather than
+	MARKBIT as the gcmarkbit for strings.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Add undef.
+
+	* fns.c (Flocale_info): Rename from Flanginfo.  Doc fixes.
+	(syms_of_fns): Corresponding change.
+
+	* alloc.c (syms_of_alloc): Doc fixes.
+
[phone]  Han Boetes  <[e-mail]>  (tiny change)
+
+	* s/netbsd.h: Use -Wl syntax.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (xim_initialize): Redo 6/24 change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* buffer.c (copy_overlays): Use EMACS_INT for positions.
+	(Fswitch_to_buffer): Don't signal an error when switching to the same
+	buffer in a dedicated window.
+
+	* alloc.c: Use bitmaps for cons, as was done for floats.
+	(init_float, init_cons): Let the normal code allocate the first block.
+	(CONS_BLOCK_SIZE): Redefine based on BLOCK_BYTES and bitmap size.
+	(CONS_BLOCK, CONS_INDEX, CONS_MARKED_P, CONS_MARK, CONS_UNMARK):
+	New macros.
+	(struct cons_block): Move conses to the beginning.  Add gcmarkbits.
+	(Fcons): Use lisp_align_malloc and CONS_UNMARK.
+	(live_cons_p): Check the pointer is not past the `conses' array.
+	(mark_maybe_object, mark_maybe_pointer): Use CONS_MARKED_P.
+	(mark_object, mark_buffer): Use CONS_MARKED_P and CONS_MARK.
+	(survives_gc_p): Use CONS_MARKED_P and simplify.
+	(gc_sweep): Use CONS_MARKED_P, CONS_UNMARK, and lisp_align_free.
+
[phone]  Paul Eggert  <[e-mail]>
+
+	GCC 3.3 (sparc) no longer puts "int foo = 0;" into data; it
+	puts it into BSS instead, at least on Solaris 8 and 9.
+	This is a valid optimization, and it may occur on other platforms,
+	so Emacs should not assume that initializing a static variable to
+	zero puts it into data.
+	* alloc.c (pure, staticvec):
+	Initialize these arrays to nonzero, so that they're not
+	put into BSS by that optimization.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (BLOCK_PADDING): Rename from ABLOCKS_PADDING.  Update users.
+	(lisp_align_malloc): Use posix_memalign is available.
+	(ABLOCKS_BASE): Use HAVE_POSIX_MEMALIGN as an optimization.
+	(STRING_BLOCK_SIZE): Rename from STRINGS_IN_STRING_BLOCK
+	for consistency.  Update users.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/netbsd.h (START_FILES_1, END_FILES_1): Always define them.
+
[phone]  Terje Rosten  <[e-mail]>
+
+	* xterm.c (x_bitmap_icon,x_wm_set_icon_pixmap): Modify to add mask,
+	and use the Gtk+ function gtk_window_icon_from_file if available.
+
+	* xfns.c (x_bitmap_mask, x_create_bitmap_mask): New functions to
+	handle mask of bitmaps.
+	(x_allocate_bitmap_record, x_destroy_bitmap): Modify to handle the
+	mask property.
+	(xg_set_icon): New function, wrapper for gtk_window_icon_from_file.
+
+	* xterm.h (xg_set_icon): New function.
+
[phone]  Paul Eggert  <[e-mail]>
+
+	* unexelf.c (unexec): Consider a section to precede the .bss
+	section if its addresses overlap that of .bss.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* Makefile.in (CFLAGS) [!OPTIMIZE]: Set CFLAGS to -g.
+
+	* config.in (HAVE_CRTIN): Add #undef.
+	(INLINE): Really inline only if OPTIMIZE is defined.
+
+	* s/netbsd.h (START_FILES, LIB_STANDARD): Use START_FILES_1,
+	END_FILES_1.
+	(START_FILES_1, END_FILES_1): New macros (conditional).
+	(LD_SWITCH_SYSTEM_TEMACS): Define.
+
+	* s/openbsd.h: Don't include bsd4-3.h.
+	(TERMINFO): Define.
+	(LIBS_TERMCAP): Define.
+	(LD_SWITCH_SYSTEM): Define (two definitions).
+
+	* xfns.c: Include libpng/png.h instead of png.h.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* buffer.c (modify_overlay): Update prototype.
+	* lisp.h (adjust_overlays_for_insert, adjust_overlays_for_delete):
+	Likewise.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (VALBITS): Define in terms of GCTYPEBITS.
+	(struct interval): Move to intervals.h.
+	(struct Lisp_Marker): Use EMACS_INT for position info.
+	(forward_point): Remove prototype of defunct function.
+	(Qmodification_hooks, Qrear_nonsticky, Fnext_property_change)
+	(Fget_text_property, Fset_text_properties, Ftext_propertes_not_all)
+	(syms_of_textprop, set_text_properties): Remove prototypes that are
+	already in intervals.h.
+
+	* intervals.h (struct interval): Move from lisp.h.
+	Use EMACS_INT for position and size info.
+
+	* coding.c: Include intervals.h for Fset_text_properties.
+
+	* buffer.h (struct buffer_text, struct buffer): Use EMACS_INT for
+	position and length information.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* buffer.h (struct buffer_text, struct buffer): Use EMACS_INT for
+	position and length information.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	Change overlays_after and overlays_before so the overlays themselves
+	are linked into lists, rather than using cons cells.  After all each
+	Lisp_Misc already occupies 5 words, so we can add a `next' field to
+	Lisp_Overlay for free and save up one cons cell per overlay (not
+	to mention one indirection when traversing the list of overlay).
+
+	* lisp.h (struct Lisp_Overlay): New field `next'.
+
+	* buffer.h (struct buffer): Change overlays_before and overlays_after
+	from Lisp lists of overlays to pointers to overlays.
+
+	* buffer.c (overlay_strings, recenter_overlay_lists):
+	Fix typo in eassert in last commit.
+	(unchain_overlay): New function.
+	(add_overlay_mod_hooklist): Use AREF.
+	(copy_overlays, reset_buffer, overlays_at, overlays_in)
+	(overlay_touches_p, overlay_strings, recenter_overlay_lists)
+	(fix_overlays_in_range, fix_overlays_before, Fmake_overlay)
+	(Fmove_overlay, Fdelete_overlay, Foverlay_lists)
+	(report_overlay_modification, evaporate_overlays, init_buffer_once):
+	Adjust to new type of overlays_(before|after).
+
+	* alloc.c (mark_object): Mark the new `next' field of overlays.
+	(mark_buffer): Manually mark the overlays_(after|before) fields.
+
+	* coding.c (run_pre_post_conversion_on_str):
+	* editfns.c (overlays_around):
+	* xdisp.c (load_overlay_strings):
+	* fileio.c (Finsert_file_contents):
+	* indent.c (current_column):
+	* insdel.c (signal_before_change, signal_after_change):
+	* intervals.c (set_point_both):
+	* print.c (temp_output_buffer_setup): Use new type for
+	overlays_(before|after).
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* buffer.c (report_overlay_modification): Don't run hooks while
+	traversing the list of overlays.
+
+	* buffer.h (struct buffer): Use an int for overlay_center.
+	(overlays_at, evaporate_overlays, recenter_overlay_lists)
+	(overlay_strings, fix_overlays_before): Use EMACS_INT for positions.
+
+	* buffer.c (reset_buffer, recenter_overlay_lists)
+	(adjust_overlays_for_insert, adjust_overlays_for_delete)
+	(fix_overlays_in_range, Fmake_overlay, Fmove_overlay)
+	(evaporate_overlays, init_buffer_once): Update use of overlay_center.
+	(overlays_at, evaporate_overlays, recenter_overlay_lists)
+	(overlay_strings, fix_overlays_before): Use EMACS_INT for positions.
+
+	* xdisp.c (fast_find_position): Remove unused var.
+
+	* cmds.c (Qexpand_abbrev): New sym.
+	(syms_of_cmds): Initialize it.
+	(internal_self_insert): Use it to call expand-abbrev.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (use_xim) [!USE_XIM]: Default to disable XIM if Emacs
+	was configured with --without-xim.
+	(x_term_init) [!USE_XIM]: Use `useXIM' resource to turn on XIM.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (reseat_1): Set it->area to TEXT_AREA.
+
+	* alloc.c (Fgarbage_collect): Doc fix.
+
[phone]  Nozomu Ando  <[e-mail]>
+
+	* buffer.c (Fkill_buffer): Clear charpos cache if necessary.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (read_minibuf): UNGCPRO before returning.
+	(Ftry_completion, Fall_completions): Doc fix.
+
+	* alloc.c (live_float_p): Check that p is not past the `floats' array,
+	now that `floats' is not the last element of the struct any more.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.h (ClipboardSequence_Proc): New type.
+
+	* w32fns.c (clipboard_sequence_fn): New variable.
+	(globals_of_w32fns): Initialize it.
+
+	* w32select.c (last_clipboard_sequence_number): New variable.
+	(Fw32_set_clipboard_data, Fw32_get_clipboard_data): Use sequence
+	number if possible.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* m/amdx86-64.h (MARKBIT):
+	* m/ia64.h (MARKBIT): Remove definition since lisp.h does not compare
+	MARKBIT and ARRAY_MARK_FLAG any more.
+
+	* m/hp800.h (XSETMARKBIT):
+	* m/sr2k.h (XSETMARKBIT):
+	* lisp.h (XSETMARKBIT): Remove unused macro.
+
+	* lisp.h (mark_object): Change prototype.
+
+	* alloc.c (mark_object): Change arg *Lisp_Object -> Lisp_Object.
+	(last_marked): Change accordingly.
+	(mark_interval, mark_maybe_object, mark_maybe_pointer)
+	(Fgarbage_collect, mark_glyph_matrix, mark_face_cache, mark_image)
+	(mark_buffer): Update calls to mark_object.
+
+	* bytecode.c (mark_byte_stack):
+	* fns.c (sweep_weak_table):
+	* keyboard.c (mark_kboards): Update calls to mark_object.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* alloc.c (struct ablock): Only include padding when there is some.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (ALIGN): Add casts to simplify usage.
+	(BLOCK_ALIGN, BLOCK_BYTES, ABLOCKS_PADDING, ABLOCKS_SIZE)
+	(ABLOCKS_BYTES, ABLOCK_ABASE, ABLOCKS_BUSY, ABLOCKS_BASE): New macros.
+	(struct ablock, struct ablocks): New types.
+	(free_ablock): New global var.
+	(lisp_align_malloc, lisp_align_free): New functions.
+	(FLOAT_BLOCK_SIZE): Redefine in terms of BLOCK_BYTES.
+	(struct float_block): Reorder and add gcmarkbits.
+	(GETMARKBIT, SETMARKBIT, UNSETMARKBIT, FLOAT_BLOCK, FLOAT_INDEX)
+	(FLOAT_MARKED_P, FLOAT_MARK, FLOAT_UNMARK): New macros.
+	(init_float, make_float): Use lisp_align_malloc.
+	(free_float, live_float_p): Don't use `type' any more.
+	(make_float): Use FLOAT_UNMARK to access to mark bit.
+	(mark_maybe_object, mark_maybe_pointer, survives_gc_p):
+	Use FLOAT_MARKED_P to access the mark bit.
+	(pure_alloc): Simplify use of ALIGN.
+	(mark_object): Use FLOAT_MARK to access the mark bit.
+	(gc_sweep): Use new macros to access the float's mark bit.
+	(init_alloc_once): Init free_ablock.
+
+	* lisp.h (struct Lisp_Float): Remove unused field `type'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (VECTOR_MARK, VECTOR_UNMARK, VECTOR_MARKED_P): New macros.
+	(GC_STRING_BYTES): Don't mask markbit (it's only used on `size').
+	(allocate_buffer): Move.
+	(string_bytes): Don't mask markbit of `size_byte'.
+	(mark_maybe_object, mark_maybe_pointer, Fgarbage_collect)
+	(mark_object, mark_buffer, survives_gc_p, gc_sweep):
+	Use the `size' field of buffers (rather than the `name' field) for
+	the mark bit, as is done for all other vectorlike objects.
+	Use the new macros to access the mark bit of vectorlike objects.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increment base size.
+
+	* xdisp.c (fast_find_position): Enable Gerd's new definition.
+
+	* xterm.c (xim_initialize): Undo previous change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (survives_gc_p): Simplify.
+
+	* buffer.c (set_buffer_internal_1): Test CONSP for lists.
+
+	* window.c (Fset_window_dedicated_p): Simplify.
+	(display_buffer_1): Don't raise the win from which minibuf was entered.
+	(temp_output_buffer_show): Don't assume BEG == 1.  Simplify.
+	(Fminibuffer_selected_window): Simplify.
+
+	* buffer.h (struct buffer_text): Lisp_Object `markers' => Lisp_Marker.
+
+	* lisp.h (unchain_marker): Lisp_Object arg => Lisp_Marker.
+	(struct Lisp_Marker): Lisp_Object `chain' => Lisp_Marker `next'.
+
+	* insdel.c (check_markers, adjust_markers_for_delete)
+	(adjust_markers_for_insert, adjust_markers_for_replace)
+	(prepare_to_modify_buffer, RESTORE_VALUE):
+	* marker.c (buf_charpos_to_bytepos, buf_bytepos_to_charpos)
+	(Fset_marker, set_marker_restricted, set_marker_both, unchain_marker)
+	(set_marker_restricted_both, Fbuffer_has_markers_at, count_markers):
+	* alloc.c (Fmake_marker, free_marker, gc_sweep):
+	* buffer.c (Fget_buffer_create, Fkill_buffer, Fset_buffer_multibyte):
+	* editfns.c (save_excursion_restore, transpose_markers):
+	* window.c (delete_window):
+	* xdisp.c (message_dolog): Update for new types.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfaces.c (set_font_frame_param): Set default_face_done_p to zero.
+	(realize_default_face): Use default_face_done_p for the force_p
+	argument to set_lface_from_font_name.  Set default_face_done_p to one.
+
+	* frame.c (make_frame): Initialize default_face_done_p.
+
+	* frame.h (struct frame): Add default_face_done_p.
+
+	* config.in: Add XRegisterIMInstantiateCallback_arg6 so it
+	will be defined.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* alloc.c (make_interval, Fmake_symbol, allocate_misc):
+	Initialize the new field `gcmarkbit'.
+	(mark_interval, MARK_INTERVAL_TREE): Use the new `gcmarkbit' field.
+	(mark_interval_tree): Don't mark the tree separately from the nodes.
+	(UNMARK_BALANCE_INTERVALS): Don't unmark the tree.
+	(mark_maybe_object, mark_maybe_pointer, Fgarbage_collect)
+	(mark_object, survives_gc_p, gc_sweep): Use new `gcmarkbit' fields.
+
+	* lisp.h (struct interval, struct Lisp_Symbol, struct Lisp_Free)
+	(struct Lisp_Marker, struct Lisp_Intfwd, struct Lisp_Boolfwd)
+	(struct Lisp_Kboard_Objfwd, struct Lisp_Save_Value)
+	(struct Lisp_Buffer_Local_Value, struct Lisp_Overlay)
+	(struct Lisp_Objfwd, struct Lisp_Buffer_Objfwd): Add `gcmarkbit' field.
+
[phone]  Dave Love  <[e-mail]>
+
+	* xterm.c (xim_initialize): Use XRegisterIMInstantiateCallback_arg6.
+
+	* strftime.c: Test HAVE_SYS__MBSTATE_H, not __hpux.  Merge changes
+	from gnulib.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Alternate messages
+	for append and partial write.
+
+	* keyboard.c (read_key_sequence): When converting upcase fn key to
+	downcase, update fkey and keytran so `backspace' gets translated.
+
+	* keyboard.c (read_avail_input): Don't signal SIGHUP in batch mode.
+
+	* process.c (wait_reading_process_input): Don't signal SIGIO
+	in batch mode.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* Makefile.in (xselect.o): Don't depend on charset.h, coding.h,
+	composite.h.
+
+	* xselect.c: Don't include charset.h, coding.h, composite.h.
+	(Qforeign_selection): New variable.
+	(syms_of_xselect): Intern and static it.
+	(selection_data_to_lisp_data): Return a unibyte string made from
+	data with `foreign-selection' text property.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* termhooks.h (EVENT_INIT): New macro.
+
+	* keyboard.c (mark_kboards): Move from alloc.c.  Mark kbd_buffer.
+
+	* alloc.c (mark_kboards): Move to keyboard.c.
+
+	* keyboard.c (record_asynch_buffer_change, read_avail_input):
+	* xterm.c (x_dispatch_event):
+	* xmenu.c (find_and_call_menu_selection):
+	* xdisp.c (handle_tool_bar_click):
+	* w32menu.c (menubar_selection_callback):
+	* sysdep.c (kbd_input_ast, read_input_waiting):
+	* msdos.c (dos_rawgetc):
+	* macterm.c (mac_check_for_quit_char):
+	* macmenu.c (menubar_selection_callback):
+	* gtkutil.c (xg_tool_bar_callback): Don't pass uninitialized
+	data to kbd_buffer_store_event.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (x_fix_overlapping_area): Always use area relative X
+	to fix redisplay problem with tall characters (such as ,AC(B).
+
[phone]  Kai Gro,A_(Bjohann  <[e-mail]>
+
+	* fileio.c (Fcopy_file): Doc fix: copies file modes, too.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Save and restore restriction.
+
[phone]  Dave Love  <[e-mail]>
+
+	* alloca.c (alloca): Declare arg as size_t.
+
+	* sysdep.c: Remove redundant include of unistd.h, stdlib.h.
+	Use HAVE_DECL_SYS_SIGLIST, not SYS_SIGLIST_DECLARED.
+
[phone]  Dave Love  <[e-mail]>
+
+	* search.c (shrink_regexp_cache): Use xrealloc.
+	(syms_of_search): Use xmalloc.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (phys_cursor_in_rect_p): Fix 2003-05-24 change.
+	Adjust phys_cursor.x to be relative to window box, rather than
+	text area before checking -- to ensure cursor is redrawn when
+	exposing window.
+	Note: This also fixes a similar (older) bug if display margins
+	are present.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (encoding_buffer_size): If coding->type is
+	coding_type_ccl, double magnification on CRLF encoding.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32reg.c (SYSTEM_DEFAULT_RESOURCES): New constant.
+	(w32_get_string_resource): Try SYSTEM_DEFAULT_RESOURCES last.
+
+	* xfaces.c (Finternal_face_x_get_resource): Do it on Windows and
+	Mac too.
+
[phone]  Dave Love  <[e-mail]>
+
+	* strftime.c: Merge changes from gnulib.
+
+	* mktime.c (__mktime_internal): Merge changes from gnulib
+	involving year 69 and dst2.
+
+	Changes to merge with gnulib version and be consistent with the
+	autoconf test:
+
+	* getloadavg.c: Set NLIST_STRUCT from HAVE_NLIST_H.
+	Use HAVE_STRUCT_NLIST_N_UN_N_NAME, not NLIST_NAME_UNION.
+	[HAVE_LOCALE_H]: Include locale.h.
+	(getloadavg) [HAVE_SETLOCALE]: Run sscanf in C locale.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* window.c (coordinates_in_window): Convert X and Y to window
+	relative coordinates inside mode-line and header-line parts.
+	Convert X and Y to margin area relative coordinates inside left
+	and right display margin parts.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (add_system_logical_colors_to_map): New function.
+	(Fx_open_connection): Use it.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* process.c (allocate_pty): Revert part of the previous patch.
+	(Faccept_process_output): Simplify.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* termhooks.h (enum event_kind): Remove MOUSE_WHEEL_EVENT.
+
+	* keyboard.c (Qmouse_wheel, mouse_wheel_syms)
+	(lispy_mouse_wheel_names): Remove.
+	(syms_of_keyboard): Remove Qmouse_wheel and mouse_wheel_syms.
+	Always define drag_and_drop_syms.
+
+	* macterm.c (XTread_socket): Map mouse wheel events to Emacs
+	WHEEL_EVENT events.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (update_tool_bar): Add missing UNGCPRO.
+
+	* buffer.c (init_buffer_once): Make kill-buffer-hook permanent-local.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
+	menu item label.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fwindow_edges): Doc fix.
+	(Fwindow_pixel_edges, Fwindow_inside_edges)
+	(Fwindow_inside_pixel_edges): New functions.
+	(syms_of_window): defsubr them.
+
+	* window.h (WINDOW_LEFT_FRINGE_COLS, WINDOW_RIGHT_FRINGE_COLS)
+	(WINDOW_MODE_LINE_LINES, WINDOW_HEADER_LINE_LINES): New macros.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* dispnew.c (Fsit_for): Don't lie about the number of args.
+
[phone]  Dave Love  <[e-mail]>
+
+	* callproc.c: Use HAVE_FCNTL_H, not USG5.
+	(syms_of_callproc) <process-environment>: Doc fix.
+
+	* doc.c: Use HAVE_FCNTL_H, not USG5.
+
+	* xfaces.c (font_rescale_ratio): Fix for K&R.
+
+	* termcap.c: Use HAVE_FCNTL_H, not _POSIX_VERSION.
+
+	* mem-limits.h: Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
+
+	* lread.c [HAVE_FCNTL_H]: Include fcntl.h.
+
+	* gtkutil.c: Include keyboard.h, charset.h, coding.h.
+	(xg_create_frame_widgets): Use ENCODE_UTF_8.
+
+	* xterm.c (Qutf_8): Move to coding.c
+
+	* xmenu.c (ENCODE_MENU_STRING): New.
+	(list_of_panes, list_of_items, digest_single_submenu, xmenu_show):
+	Use it.
+
+	* coding.h (ENCODE_UTF_8): New.
+	(Qutf_8): Declare.
+
+	* coding.c (Qutf_8): New.
+	(syms_of_coding): Intern it.
+
+	* fns.c: Doc fixes.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* buffer.c (Fset_buffer_multibyte): Fix previous change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (openp): Make sure STR is a string.
+
[phone]  David Ponce  <[e-mail]>
+
+	* termhooks.h (enum event_kind): Add new WHEEL_EVENT event.
+	Declare MOUSE_WHEEL_EVENT only if MAC_OSX defined.
+
+	* keyboard.c (Qmouse_wheel): Declare only if MAC_OSX defined.
+	(mouse_wheel_syms, lispy_mouse_wheel_names): Likewise.
+	(discard_mouse_events): Discard WHEEL_EVENT events too.
+	(lispy_wheel_names, wheel_syms): New.
+	(syms_of_keyboard): Init and staticpro `wheel_syms'.  Init and
+	staticpro `Qmouse_wheel' and `mouse_wheel_syms' only if MAC_OSX defined.
+	(make_lispy_event): Add WHEEL_EVENT handler.
+
+	* w32term.c (construct_mouse_wheel): Construct WHEEL_EVENT.
+	(w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs
+	WHEEL_EVENT events.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): byte-run, float-sup, map-ynp, and
+	timer are in lisp/emacs-lisp.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* buffer.c (Fset_buffer_multibyte): Correctly recover a narrowed
+	region when a buffer is changed to unibyte.
+
+	* charset.h (VALID_LEADING_CODE_P): New macro.
+	(UNIBYTE_STR_AS_MULTIBYTE_P): Check more rigidly.
+
+	* coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): If coding->flags
+	is nonzero, accept multibyte form of eight-bit-control chars.
+	(decode_composition_emacs_mule): Likewise.
+	(decode_coding_emacs_mule): Likewise.
+	(encode_coding_emacs_mule): If coding->flags is nonzero, produce
+	multibyte form of eight-bit-control chars.
+
+	* fileio.c (Qauto_save_coding, auto_save_coding): New variables.
+	(Finsert_file_contents): If coding-system-for-read is bound to
+	Qauto_save_coding, use the coding system emacs-mule with special
+	setting for recovering a file.
+	(choose_write_coding_system): On auto saving, use the coding
+	system emacs-mule with special setting for auto saving.
+	(syms_of_fileio) <Qauto_save_coding>: Intern and staticpro it.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (ccl_coding_driver): Set ccl->eight_bit_control
+	properly before calling ccl_driver.
+
+	* ccl.h (struct ccl_program) <eight_bit_control>: Comment fixed.
+
+	* ccl.c (CCL_WRITE_CHAR): Increment extra_bytes only when it is nonzero.
+	(ccl_driver): Initialize extra_bytes to ccl->eight_bit_control.
+	(setup_ccl_program): Initialize ccl->eight_bit_control to zero.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* xfaces.c (realize_default_face): Do not abort if lface is
+	non-existent - reverts change from 2003-05-19.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (decode_coding_iso2022): Pay attention to the byte
+	sequence of CTEXT extended segment, and retain those bytes as is.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (ENCODE_UNSAFE_CHARACTER): Adjust for the name change
+	of CODING_REPLACEMENT_CHARACTER.
+	(decode_coding_iso2022): If CODING_FLAG_ISO_SAFE, set
+	CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in coding->mode, and
+	check this flag on encoding.
+	(encode_coding_sjis_big5):
+	Check CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag of coding->mode.
+	(Fset_terminal_coding_system_internal):
+	Set CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in terminal_coding.mode
+	instead of setting CODING_FLAG_ISO_SAFE flag in terminal_coding.flags.
+
+	* coding.h (CODING_REPLACEMENT_CHARACTER): Rename from
+	CODING_INHIBIT_CHARACTER_SUBSTITUTION.
+	(CODING_MODE_INHIBIT_UNENCODABLE_CHAR): New macro.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (syms_of_print) <print-escape-nonascii>: Doc fix.
+
+	* eval.c (unbind_to): Move init of this_binding to separate statement.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (expose_window): Fix error in calculation of
+	window relative coordinates of area to redisplay.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (GET_WHEEL_DELTA_WPARAM): New macro.
+
[phone]  David Ponce  <[e-mail]>
+
+	Handle W32 mouse wheel events as mouse click events, like in X.
+
+	* keyboard.c (make_lispy_event) [WINDOWSNT]: Don't handle
+	MOUSE_WHEEL_EVENT anymore.
+
+	* w32term.c (construct_mouse_wheel): Result is a MOUSE_CLICK_EVENT.
+	Scrolling down/up the mouse wheel is respectively mapped to mouse
+	button 4 and 5.
+	(w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs
+	MOUSE_CLICK_EVENT events.  Forward w32 MSH_MOUSEWHEEL events as
+	WM_MOUSEWHEEL events.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <default-direction-reversed>: Doc fix.
+
+	* xdisp.c (try_window_id): Avoid aborting if PT is inside a
+	partially visible line.
+
+	* alloc.c (Fgarbage_collect): Fix last change.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Don't call Qface_set_after_frame_default.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* window.c (Fset_window_buffer): Add type of `keep_margins'.
+	(Fset_window_fringes, Fset_window_scroll_bars): Declare before use.
+
+	* window.h (window_box_text_cols): Declare.
+
+	* xdisp.c (window_text_bottom_y, draw_row_fringe_bitmaps)
+	(x_draw_vertical_border): Remove unused var `f'.
+
+	* xfaces.c (build_scalable_font_name): Remove `unused var
+	pixel_size' warning.
+
+	* xfns.c (png_load): Remove `unused vars intent, image_gamma' warning.
+
+	* unexelf.c (unexec): Remove `unused var n' warning.
+
+	* strftime.c (my_strftime_localtime_r): Remove `defined but
+	unused' warning.
+
+	* process.c (allocate_pty): Remove `unused var stb' and
+	`cp might be used uninitialized' warnings.
+
+	* dispnew.c (mode_line_string): Remove unused var `f'.
+
+	* coding.c (find_safe_codings): Remove unused var `i'.
+
+	* bytecode.c (Fbyte_code): Remove `unused val' warning.
+
+	* buffer.c (Fkill_buffer): Remove unused var `list'.
+
+	* alloc.c (Fgarbage_collect): Remove `unused var tail' warning.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* frame.c (make_frame): Condition want_fullscreen with
+	HAVE_WINDOW_SYSTEM.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* window.c (Fset_window_scroll_bars): Fix typo in argument name.
+	(Fwindow_scroll_bars): Fix typo in docstring.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes serve several purposes:
+
+	1) Swap the position of fringes and display margins in windows, i.e.
+	the fringes are now displayed between the margins and the text area
+	(by default).
+
+	2) Allow fringe and scroll bar parameters to be set per-buffer and
+	per-window (like display margins).  Such settings are now stored
+	in window configurations, preserved when frames are resized, and
+	copied when windows are split vertically or horizontally.
+	Several bugs related to display margins have been fixed.
+
+	3) Consistently use FRAME_FONT and FRAME_FONTSET macros.
+
+	4) Use FRAME_COLUMN_WIDTH (f) consistently throughout the code
+	rather than FRAME_WIDTH	(FRAME_FONT (f)).
+
+	5) Introduce a consistent naming of variables, members and macros
+	depending on whether their value is measured in pixels or in
+	canonical columns/lines.  Pixel dimensions are named *_width and
+	*_height, while canonical columns/lines are named *_cols and
+	*_lines.  Pixel positions are named *_x and *_y, while column/line
+	positions are named *_col and *_line.
+
+	6) Consolidate more of the X, W32, and MAC gui code by moving
+	common data into struct frame, and generalize it for the non-gui
+	case by using suitable defaults.
+
+	7) Cleanup and consolidate the macros controlling frame and window
+	layout into frame.h and window.h, and generalize the use of the
+	various window_box_* functions (enhanced to handle the new fringe
+	position and the per-window fringe and scroll bar settings).
+
+	* frame.h (struct frame): Rename members height to text_lines,
+	width to text_cols, window_height to total_lines, window_width to
+	total_cols, new_height to new_text_lines, new_width to
+	new_text_cols.  All uses changed.
+	(struct frame): New members which consolidate common members of
+	x_output, w32_output, and mac_output structures: left_pos,
+	top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
+	win_gravity, size_hint_flags, border_width, internal_border_width,
+	line_height, fringe_cols, left_fringe_width, right_fringe_width,
+	want_fullscreen.  All uses changed.
+	(struct frame): New member column_width contaning the canonical
+	column width, analogue to line_height.  All uses changed.
+	(struct frame): Rename members scroll_bar_pixel_width to
+	config_scroll_bar_width, and scroll_bar_cols to
+	config_scroll_bar_cols.  All uses changed.
+	(struct frame): New member scroll_bar_actual_width which
+	consolidates and renames the vertical_scroll_bar_extra member of
+	x_output, w32_output, and mac_output structures.  All uses changed.
+	(FRAME_PIXEL_HEIGHT): Rename from PIXEL_HEIGHT and moved
+	from x/w32/macterm.h files.  All uses changed.  Also change code
+	which referred to f->output_data...->pixel_height.
+	(FRAME_PIXEL_WIDTH): Rename from PIXEL_WIDTH and moved
+	from x/w32/macterm.h files.  All uses changed.  Also change code
+	which referred to f->output_data...->pixel_width.
+	(FRAME_LINES): Rename from FRAME_HEIGHT.  All uses changed.
+	Also change code which referred to f->height.
+	(FRAME_COLS): Rename from FRAME_WIDTH.  All uses changed.
+	Also change code which referred to f->width.
+	(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
+	to update new_text_lines and new_text_cols members directly.
+	(FRAME_CONFIG_SCROLL_BAR_WIDTH): Rename from
+	FRAME_SCROLL_BAR_PIXEL_WIDTH.  All uses changed.
+	(FRAME_CONFIG_SCROLL_BAR_COLS): Rename from
+	FRAME_SCROLL_BAR_COLS.  All uses changed.
+	(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
+	Rename from FRAME_LEFT_SCROLL_BAR_WIDTH and
+	FRAME_RIGHT_SCROLL_BAR_WIDTH, resp.  All uses changed.
+	(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
+	(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
+	(FRAME_TOTAL_COLS): Rename from FRAME_WINDOW_WIDTH.
+	(SET_FRAME_COLS): Rename from SET_FRAME_WIDTH.
+	(FRAME_TOTAL_COLS_ARG): Rename from FRAME_WINDOW_WIDTH_ARG.
+	(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
+	(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
+	(FRAME_LINE_HEIGHT): Rename from CANON_Y_UNIT.
+	Unconditionally return line_height member (it now has proper value
+	also for non-window frames).
+	(FRAME_COLUMN_WIDTH): Rename from CANON_X_UNIT.  Unconditionally
+	return new column_width member (rather than the default font width).
+	(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
+	(FRAME_RIGHT_FRINGE_WIDTH): Rename from FRAME_X_... and moved
+	from x/w32/macterm.h files.  Unconditionally return corresponding
+	member of frame structure (they now have proper values also for
+	non-window frames).
+	(FRAME_TOTAL_FRINGE_WIDTH): Rename from FRAME_FRINGE_WIDTH.
+	Calculate return value from left and right widths.
+	(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
+	internal_border_width member (has proper value for non-window frame).
+	(FRAME_PIXEL_X_FROM_CANON_X): Rename from PIXEL_X_FROM_CANON_X.
+	(FRAME_PIXEL_Y_FROM_CANON_Y): Rename from PIXEL_Y_FROM_CANON_Y.
+	(FRAME_CANON_X_FROM_PIXEL_X): Rename from CANON_X_FROM_PIXEL_X.
+	(FRAME_CANON_Y_FROM_PIXEL_Y): Rename from CANON_Y_FROM_PIXEL_Y.
+	(FRAME_LINE_TO_PIXEL_Y): Rename from CHAR_TO_PIXEL_ROW,
+	consolidated from xterm.h, macterm.h, and w32term.h.
+	(FRAME_COL_TO_PIXEL_X): Rename from CHAR_TO_PIXEL_COL,
+	consolidated from xterm.h, macterm.h, and w32term.h.
+	(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rename from
+	CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
+	(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Rename from
+	CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
+	(FRAME_PIXEL_Y_TO_LINE): Rename from PIXEL_TO_CHAR_ROW
+	consolidated from x/mac/w32term.h.
+	(FRAME_PIXEL_X_TO_COL): Rename from PIXEL_TO_CHAR_COL
+	consolidated from x/mac/w32term.h.
+	(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Rename from
+	PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
+	(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Rename from
+	PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
+
+	* window.h (struct window): Rename members left to left_col,
+	top to top_line, height to total_lines, width to total_cols,
+	left_margin_width to left_margin_cols, right_margin_width to
+	right_margin_cols, orig_height to orig_total_lines, orig_top to
+	orig_top_line.  All uses changed.
+	(struct window): New members left_fringe_width, right_fringe_width,
+	fringes_outside_margins, scroll_bar_width, vertical_scroll_bar_type.
+	(WINDOW_XFRAME, WINDOW_FRAME_COLUMN_WIDTH, WINDOW_FRAME_LINE_HEIGHT):
+	New macros primarily used to simplify other macros.
+	(WINDOW_TOTAL_COLS): New macro.  Change relevant code that
+	referred to XINT (w->width).
+	(WINDOW_TOTAL_LINES): New macro.  Change relevant code that
+	referred to XINT (w->height).
+	(WINDOW_TOTAL_WIDTH): New macro.  Change relevant code that
+	referred to XINT (w->width) * canon_x_unit.
+	(WINDOW_TOTAL_HEIGHT): New macro.  Change relevant code that
+	referred to XINT (w->height) * canon_y_unit.
+	(WINDOW_LEFT_EDGE_COL): New macro.  Change relevant code that
+	referred to XINT (w->left).
+	(WINDOW_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_EDGE.  Change
+	all uses and code that referred to XINT (w->left) + XINT (w->width).
+	(WINDOW_TOP_EDGE_LINE): New macro.  Change relevant code that
+	referred to XINT (w->top).
+	(WINDOW_BOTTOM_EDGE_LINE): New macro.  Change relevant code that
+	referred to XINT (w->top) + XINT (w->height).
+	(WINDOW_LEFT_EDGE_X): New macro.  Change relevant code that
+	referred to XINT (w->left) * canon_x_unit.
+	(WINDOW_RIGHT_EDGE_X): New macro.  Change relevant code that
+	referred to (XINT (w->left) + XINT (w->width)) * canon_x_unit.
+	(WINDOW_TOP_EDGE_Y): New macro.  Change relevant code that
+	referred to XINT (w->top) * canon_y_unit.
+	(WINDOW_BOTTOM_EDGE_Y): New macro.  Change relevant code that
+	referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit.
+	(WINDOW_LEFTMOST_P): New macro.
+	(WINDOW_BOX_LEFT_EDGE_COL): Rename from WINDOW_LEFT_MARGIN.
+	All uses changed.
+	(WINDOW_BOX_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_MARGIN.
+	All uses changed.
+	(WINDOW_BOX_LEFT_EDGE_X): Rename from
+	WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h.
+	Do not exclude left fringe width.
+	(WINDOW_BOX_RIGHT_EDGE_X): Rename from
+	WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h.
+	Do not exclude fringe widths.
+	(WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH)
+	(WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros.
+	Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH,
+	FRAME_RIGHT_FRINGE_WIDTH, FRAME_FRINGE_COLS, and
+	FRAME_TOTAL_FRINGE_WIDTH to allow per-window fringe settings.
+	(WINDOW_HAS_FRINGES_OUTSIDE_MARGINS): New macro.
+	(WINDOW_VERTICAL_SCROLL_BAR_TYPE, WINDOW_HAS_VERTICAL_SCROLL_BAR)
+	(WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT)
+	(WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT)
+	(WINDOW_CONFIG_SCROLL_BAR_WIDTH, WINDOW_CONFIG_SCROLL_BAR_COLS):
+	New macros.  Change code which referenced corresponding
+	FRAME_VERTICAL_SCROLL_BAR_TYPE, FRAME_HAS_VERTICAL_SCROLL_BARS,
+	FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT,
+	FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT,
+	FRAME_SCROLL_BAR_PIXEL_WIDTH, and FRAME_SCROLL_BAR_COLS macros to
+	allow per-window scroll-bar settings.
+	(WINDOW_LEFT_SCROLL_BAR_COLS, WINDOW_RIGHT_SCROLL_BAR_COLS): New macros.
+	(WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH): New macro.  Change code that
+	referred to FRAME_LEFT_SCROLL_BAR_WIDTH.
+	(WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro.  Change code
+	that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and
+	FRAME_SCROLL_BAR_WIDTH.
+	(WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH)
+	(WINDOW_SCROLL_BAR_AREA_X): New macros.
+	(WINDOW_HEADER_LINE_HEIGHT): Rename from
+	WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h.
+	(WINDOW_BOX_HEIGHT_NO_MODE_LINE): Rename from
+	WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h.
+	(WINDOW_BOX_TEXT_HEIGHT): Rename from
+	WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h.
+	(WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y)
+	(FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y)
+	(WINDOW_TEXT_TO_FRAME_PIXEL_X): Move here from dispextern.h.
+	(WINDOW_LEFT_MARGIN_WIDTH): Rename from
+	WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h.
+	(WINDOW_RIGHT_MARGIN_WIDTH): Rename from
+	WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h.
+	(window_from_coordinates): Update prototype.
+	(Fset_window_buffer): Update EXFUN.
+	(set_window_buffer): Update prototype.
+
+	* dispextern.h (struct glyph_matrix): Rename members window_left_x
+	to window_left_col, window_top_y to window_top_line.  All uses
+	changed.
+	(FRAME_INTERNAL_BORDER_WIDTH_SAFE): Remove macro; can now safely
+	use FRAME_INTERNAL_BORDER_WIDTH macro instead as
+	internal_border_width is now set to 0 for non-window frames.
+	(WINDOW_DISPLAY_PIXEL_WIDTH, WINDOW_DISPLAY_PIXEL_HEIGHT)
+	(WINDOW_DISPLAY_MODE_LINE_HEIGHT, WINDOW_DISPLAY_HEADER_LINE_HEIGHT)
+	(WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, WINDOW_DISPLAY_TEXT_HEIGHT)
+	(WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X)
+	(WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y, WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y)
+	(WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y)
+	(FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y)
+	(WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH)
+	(WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, WINDOW_WANTS_MODELINE_P):
+	Move to window.h and renamed [see window.h changes].
+	(WINDOW_AREA_TO_FRAME_PIXEL_X, WINDOW_AREA_PIXEL_WIDTH)
+	(WINDOW_DISPLAY_TEXT_AREA_PIXEL_WIDTH): Remove macros.
+	(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P):
+	Use WINDOW_TOTAL_LINES.
+	(frame_update_line_height): Remove prototype.
+
+	* buffer.h (struct buffer): Rename members measured in columns:
+	left_margin_width to left_margin_cols, right_margin_width to
+	right_margin_cols.  All uses changed.
+	New members left_fringe_width, right_fringe_width,
+	fringes_outside_margins for per-buffer fringe settings.
+	New members scroll_bar_width and vertical_scroll_bar_type for
+	per-buffer scroll bar settings.
+
+	* buffer.c (init_buffer_once): Set buffer_defaults and
+	buffer_local_flags for new buffer-local variables
+	left_fringe_width, right_fringe_width, fringes_outside_margins,
+	scroll_bar_width, and vertical_scroll_bar_type.
+	(syms_of_buffer): Defvar_per_buffer them, and defvar_lisp_nopro
+	default-* variables for them.
+
+	* dispnew.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(mode_line_string): No need to adjust width for mode lines, as it
+	is already adjusted by the caller.
+	(marginal_area_string): Handle fringes inside/outside margins.
+
+	* frame.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(make_frame): Initialize left_fringe_width, right_fringe_width,
+	fringe_cols, scroll_bar_actual_width, border_width,
+	internal_border_width, column_width, line_height, x_pixels_diff,
+	y_pixels_diff, want_fullscreen, size_hint_flags, and win_gravity
+	members with values suitable for a non-window frames.
+
+	* gtkutil.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* indent.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* keyboard.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(make_lispy_event): Use window positions returned from
+	window_from_coordinates when constructing the lisp event for
+	MOUSE_CLICK_EVENT and DRAG_N_DROP_EVENT, rather than calculating
+	(incorrect) values locally.
+	(make_lispy_movement): Use window positions returned from
+	window_from_coordinates when constructing the lisp event, rather
+	than calculating (incorrect) values locally.
+
+	* scroll.c: Make (some) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* sunfns.c (Fsun_menu_internal): Adapt to per-window fringes and
+	scroll-bars.
+
+	* sysdep.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* term.c: Make (some) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* widget.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* window.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(make_window): Initialize new members
+	left_margin_cols, right_margin_cols, left_fringe_width,
+	right_fringe_width, fringes_outside_margins, scroll_bar_width,
+	and vertical_scroll_bar_type.
+	(coordinates_in_window): Adapt to new fringe/margin positions
+	and per-window fringes and scroll-bars.
+	Fix bug related to incorrectly adjusting coordinates by
+	frame's internal_border_width (the effect normally negible since
+	the internal_border_width is typically 0 or 1 pixel, but very
+	noticeable for an internal_border_width of e.g. 25 pixels).
+	Upon successful return (other than ON_NOTHING), the coordinates
+	are now always properly converted to window relative for the
+	given display element.
+	(window_from_coordinates): Add new parameters wx and wy to
+	return the window relative x and y position in the returned
+	window and part.  A null arg means, don't return the position.
+	All callers changed.
+	(adjust_window_margins): New function which may reduce the width
+	of the display margins if a window's text area is too small after
+	resizing or splitting windows.
+	(size_window): Fix bug that did not account for display margin
+	widths when checking the minimum width of a window; use
+	adjust_window_margins.
+	(set_window_buffer): Call Fset_window_fringes and
+	Fset_window_scroll_bars to setup per-window elements.
+	Add new arg KEEP_MARGINS_P.  Non-nil means to keep window's
+	existing display margin, fringe widths, and scroll bar settings
+	(e.g. after splitting a window or resizing the frame).
+	All callers changed.
+	(Fset_window_buffer): New arg KEEP_MARGINS.  All callers changed.
+	(Fsplit_window): Duplicate original window's display margin,
+	fringe, and scroll-bar settings; then call Fset_window_buffer with
+	KEEP_MARGINS non-nil.  This fixes a bug which caused a split
+	window to only preserve the display margins in one of the windows.
+	When splitting horizontally, call adjust_window_margins	on both
+	windows to ensure that the text area of the new windows is non too
+	narrow.  This fixes a bug which could cause Emacs to trap if the
+	width of the split window was less than the width of the display
+	margins.
+	(window_box_text_cols): Rename from window_internal_width.
+	All uses changed.  Adapt to per-window fringes and scroll bars.
+	Fix bug that caused vertical separator to be subtracted also on
+	window frames.  Fix another bug that did not reduce the returned
+	value by the columns used for display margins.
+	(window_scroll_line_based): Fix bug related to scrolling too much
+	when display margins are present (implicitly fixed by the fix to
+	window_box_text_cols).
+	(scroll_left, scroll_right): Fix bug related to scrolling too far
+	by default when display margins are present (implicitly fixed by
+	the fix to window_box_text_cols).
+	(struct saved_window): Rename members left to left_col, top to
+	top_line, width to total_cols, height to total_lines, orig_top to
+	orig_top_line, orig_height to orig_total_lines.  All uses changed.
+	New members left_margin_cols, right_margin_cols,
+	left_fringe_width, right_fringe_width, fringes_outside_margins,
+	scroll_bar_width, and vertical_scroll_bar_type for saving
+	per-window display elements.
+	(Fset_window_configuration): Restore display margins, fringes,
+	and scroll bar settings.  This fixes a bug which caused display
+	margins to be discarded when saving and restoring a window
+	configuration.
+	(save_window_save): Save display margins, fringes, and scroll bar
+	settings.  This fixes a bug which caused display margins to be
+	discarded when saving and restoring a window configuration.
+	(Fset_window_margins): Do nothing if display margins are not
+	really changed.  Otherwise, call adjust_window_margins to ensure
+	the text area doesn't get too narrow.  This fixes a bug which
+	could cause Emacs to trap if setting display margins wider than
+	the width of the window.
+	(Fset_window_fringes): New defun to allow user to specifically set
+	this window's fringe widths and position vs. display margins.
+	(Fwindow_fringes): New defun to return window's actual fringe settings.
+	(Fset_window_scroll_bars): New defun to allow user to specifically
+	set this window's scroll bar width and position.
+	(Fwindow_scroll_bars): New defun to return window's actual scroll
+	bar settings.
+	(compare_window_configurations): Also compare display margins,
+	fringes, and scroll bar settings.
+	(syms_of_window): Defsubr new defuns for fringe and scroll bars.
+
+	* xdisp.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(window_box_width): Adapt to per-window fringes and scroll bars,
+	and new fringe vs. display margin position.  Note that returned
+	value is no longer guaranteed to be a whole multiple of the frame
+	column width, since per-window fringes may now be any width.
+	(window_box_left_offset): New function like window_box_left, but
+	value is relative to left border of window (rather than frame).
+	(window_box_right_offset): New function like window_box_right,
+	but value is relative to left border of window.
+	(window_box_left): Adapt to per-window fringes and scroll bars,
+	and new fringe vs. display margin position.  Simplify by using
+	WINDOW_LEFT_EDGE_X and window_box_left_offset.
+	(window_box): Allow null args for unnecessary return values;
+	change/simplify relevant callers.
+	(x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars,
+	and new fringe vs. display margin position.
+	Use window_box_left_offset and window_box_right_offset
+	(get_glyph_string_clip_rect): Adapt to per-window fringes and
+	scroll bars, and new fringe vs. display margin position.
+	Use WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH.
+	(draw_fringe_bitmap): Rework to handle per-window fringes and new
+	fringe vs. display margin position.
+	(hscroll_window_tree): Use window_box_width instead of window_box.
+	(redisplay_window): Adapt to per-window scroll bars.
+	(draw_glyphs): Rework to handle per-window fringes and scroll
+	bars, and new fringe vs. display margin position.
+	Use WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left.
+	(x_clear_end_of_line): Adapt to per-window fringes and scroll
+	bars, and new fringe vs. display margin position.  Fix bug which
+	increased total width of full_width rows by width of scroll bars
+	although window's total width already includes that.
+	(x_fix_overlapping_area): Simplify using window_box_left_offset.
+	(expose_area): Simplify using window_box_left_offset.
+	(x_draw_vertical_border): Handle per-window scroll bar settings,
+	mixing windows with left, right and no scroll bars.
+
+	* xfaces.c [WINDOWSNT]: Move redefinition of FONT_WIDTH macro to
+	where it's used in x_list_fonts (for clarity).
+	(frame_update_line_height): Remove unused function; functionality
+	is now done directly when setting the default font in x_set_font.
+
+	* xfns.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* xmenu.c: Make (some) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* xterm.h (struct x_output): Move members left_pos, top_pos,
+	border_width, pixel_height, pixel_width, line_height,
+	internal_border_width, vertical_scroll_bar_extra,
+	left_fringe_width, right_fringe_width, fringe_cols,
+	fringes_extra, win_gravity, size_hint_flags, want_fullscreen,
+	x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
+	(FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
+	(FRAME_DEFAULT_FONT_WIDTH): Remove macro.
+	(PIXEL_WIDTH, PIXEL_HEIGHT)
+	(FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
+	(FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
+	frame.h and renamed [see frame.h changes].
+	(CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
+	(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
+	(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
+	and renamed [see frame.h changes].
+
+	* xterm.c: Make (several) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
+	(scroll_run): Adapt to new fringe position.
+	(glyph_rect): Use window coordinates returned from
+	window_from_coordinates rather than frame_to_window_pixel_xy.
+	(XTset_vertical_scroll_bar): Adapt to per-window fringes and
+	scroll-bars.
+	(handle_one_xevent): Simplify a USE_GTK conditional.
+	(x_clip_to_row): Remove superfluous whole_line_p arg and code
+	(fringes are now inside margins, i.e. always in the clipping area).
+	All callers changed.
+	(x_new_font): Set FRAME_COLUMN_WIDTH and FRAME_LINE_HEIGHT
+	directly, then call compute_fringe_widths.  Don't call
+	frame_update_line_height.
+
+	* w32term.h (struct w32_output): Move members left_pos, top_pos,
+	border_width, pixel_height, pixel_width, line_height,
+	internal_border_width, vertical_scroll_bar_extra,
+	left_fringe_width, right_fringe_width, fringe_cols,
+	fringes_extra, win_gravity, size_hint_flags, want_fullscreen,
+	x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
+	(FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
+	(FRAME_DEFAULT_FONT_WIDTH): Remove macro.
+	(PIXEL_WIDTH, PIXEL_HEIGHT)
+	(FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
+	(FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
+	frame.h and renamed [see frame.h changes].
+	(CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
+	(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
+	(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
+	and renamed [see frame.h changes].
+
+	* w32term.c: Make (several) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
+	(glyph_rect): Use window coordinates returned from
+	window_from_coordinates rather than frame_to_window_pixel_xy.
+	(XTset_vertical_scroll_bar): Adapt to per-window fringes and
+	scroll-bars.
+	(w32_clip_to_row): Remove superfluous whole_line_p arg and code
+	(fringes are now inside margins, i.e. always in the clipping area).
+	All callers changed.
+	(x_new_font): Set FRAME_COLUMN_WIDTH and FRAME_LINE_HEIGHT
+	directly, then call compute_fringe_widths.  Don't call
+	frame_update_line_height.
+
+	* w32console.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* w32fns.c: Make (many) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* w32menu.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* macterm.h (struct mac_output): Move members left_pos, top_pos,
+	border_width, pixel_height, pixel_width, line_height,
+	internal_border_width, vertical_scroll_bar_extra,
+	left_fringe_width, right_fringe_width, fringe_cols,
+	fringes_extra, win_gravity, size_hint_flags, want_fullscreen,
+	x_pixels_diff, y_pixels_diff to struct frame (frame.h).
+	(FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
+	(FRAME_DEFAULT_FONT_WIDTH): Remove macro.
+	(PIXEL_WIDTH, PIXEL_HEIGHT)
+	(FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
+	(FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
+	frame.h and renamed [see frame.h changes].
+	(CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
+	(CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
+	(PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
+	and renamed [see frame.h changes].
+
+	* macterm.c: Make (several) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
+	(glyph_rect): Use window coordinates returned from
+	window_from_coordinates rather than frame_to_window_pixel_xy.
+	(XTset_vertical_scroll_bar): Adapt to per-window fringes and
+	scroll-bars.
+	(x_clip_to_row): Remove superfluous whole_line_p arg and code
+	(fringes are now inside margins, i.e. always in the clipping area).
+	All callers changed.
+	(x_new_font): Set FRAME_COLUMN_WIDTH and FRAME_LINE_HEIGHT
+	directly, then call compute_fringe_widths.  Don't call
+	frame_update_line_height.
+
+	* macfns.c: Make (several) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(x_real_positions): Set f->x_pixels_diff and f->y_pixels_diff to 0.
+
+	* macmenu.c: Make (few) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+
+	* msdos.h (struct x_output): Remove members left_pos, top_pos,
+	and line_height, and use corresponding new members in struct
+	frame.  All uses changed.
+	(FRAME_LINE_HEIGHT, FRAME_INTERNAL_BORDER_WIDTH): Remove macros;
+	superseeded by corresponding macros in frame.h.
+
+	* msdos.c: Make (several) trivial substitutions for renamed and
+	new macros in dispextern.h, frame.h and window.h.
+	(IT_note_mouse_highlight): Use updated window coordinates returned
+	by window_from_coordinates, rather than adjusting them locally.
+	(internal_terminal_init): No need to initialize line_height here;
+	it now defaults to 1.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (read_key_sequence): Adjust fkey and keytran when
+	dropping `down' events.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* coding.c (find_safe_codings): Fix last change.
+
[phone]  Istvan Marko  <[e-mail]>  (tiny change)
+
+	* xfns.c (x_window): Fix typo from 2003-05-21 change.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xdisp.c (display_mode_element): Increase max depth.
+	Simplify the error handling code.  Use a different error string
+	for the case where we hit the depth limit.
+
+	* lisp.h (Vfundamental_mode_abbrev_table): Don't declare.
+
+	* buffer.c (reset_buffer_local_variables): Remove redundant setting.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* intervals.c (get_local_map): Don't get char-property of previous
+	point any more: get_pos_property already does it and better.
+
[phone]  Dave Love  <[e-mail]>
+
+	[Merged from unicode branch.]
+
+	* xfns.c (x_window, x_window): Use use_xim.
+
+	* xterm.c (use_xim): Initialize.
+	(xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
+	(x_term_init): Maybe set use_xim.
+
+	* xterm.h (use_xim) [HAVE_X_I18N]: Declare.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* unexw32.c (_start): Remove _fmode initialization.
+
+	* emacs.c (main) [WINDOWSNT]: Move it here.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/gnu-linux.h (MAIL_USE_FLOCK): Make it conditional.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfaces.c (Finternal_set_lisp_face_attribute): Handle Qunspecified
+	as value for QCfont attribute.
+	(realize_default_face): lface should already exist; crash if not.
+	Specify 0 for FORCE_P when calling set_lface_from_font_name.
+
+	* frame.c (Fignore_event): Doc fix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (decode_coding_string): Handle post-read-conversion
+	even if the coding doesn't require decoding.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* callproc.c (Fcall_process_region): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (Fload): Print a message if package is obsolete.
+
+	* window.c (Fselect_window): Add optional `norecord' arg.
+	(select_window_1): Fold into Fselect_window.
+	(select_window_norecord): New function.
+	(temp_output_buffer_show): Use it.  Preserve current buffer.
+
+	* window.h (Fselect_window): Update declaration.
+
+	* window.c (delete_window, Fother_window, Fset_window_configuration):
+	* minibuf.c (read_minibuf):
+	* macterm.c (x_new_focus_frame):
+	* frame.c (do_switch_frame, Fset_frame_selected_window, Fdelete_frame):
+	* callint.c (Fcall_interactively):
+	* xterm.c (x_new_focus_frame): Pass nil as new arg to Fselect_window.
+
+	* buffer.c (Fpop_to_buffer): Pass norecord to Fselect_window.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* process.c (read_process_output): Back out change from 2003-03-09.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* editfns.c (get_pos_property): Don't assume that `object' = nil.
+
+	* textprop.c (text_property_stickiness): New arg `buffer'.
+
+	* intervals.h (text_property_stickiness): New arg `buffer'.
+	(get_pos_property): Declare.
+
+	* intervals.c (get_local_map): Use get_pos_property, to obey
+	stickiness and empty overlays.
+	(create_root_interval, graft_intervals_into_buffer): Use BEG.
+	(merge_properties, intervals_equal, merge_properties_sticky):
+	Use XCAR, XCDR.
+	(adjust_for_invis_intang): Pass new arg to text_property_stickiness.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (read_minibuf): If buffer is empty, record the default
+	in the history.
+	(Fminibuffer_complete_word): When deleting the overlap, take account
+	of its real position.
+
+	* fns.c (map_char_table): Fix previous change.
+
+	* syntax.c (find_defun_start):
+	When open_paren_in_column_0_is_defun_start,
+	return beginning of buffer.
+
+	* lisp.h (map_char_table): Declare added arg.
+
+	* fns.c (map_char_table): New arg TABLE gets the master table.
+	All calls changed.
+	Process default and inheritance, resorting to Faref if necessary.
+
+	* keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
+	(Faccessible_keymaps): Pass new arg to map_char_table.
+
+	* fontset.c (Ffontset_info): Pass new arg to map_char_table.
+
+	* casetab.c (set_case_table): Pass new arg to map_char_table.
+
+	* data.c (let_shadows_buffer_binding_p): Make target of p volatile.
+
+	* lisp.h (specbinding_func): New typedef.
+	(struct specbinding): Use specbinding_func, to put the `volatile'
+	in the right place.
+
+	* alloc.c (Fgarbage_collect): Cast pointers into specpdl
+	to avoid GCC warning.
+
[phone]  Ralph Schleicher  <[e-mail]>
+
+	* fileio.c (Fdelete_file): Handle symlinks pointing to directories.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (apply_modifiers): Don't fill the other cache.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* .gdbinit-union: New file, for USE_LISP_UNION_TYPE users.
+
+	* window.h (Qwindowp, Qwindow_live_p, Vwindow_list)
+	(Fwindow_end, Fselected_window, Fdelete_window, Fwindow_buffer)
+	(Fget_buffer_window, Fsave_window_excursion, Fsplit_window)
+	(Fset_window_configuration, Fcurrent_window_configuration)
+	(compare_window_configurations, Fcoordinates_in_window_p, Fwindow_at)
+	(Fpos_visible_in_window_p, mark_window_cursors_off)
+	(window_internal_height, window_internal_width, Frecenter)
+	(Fscroll_other_window, Fset_window_start, temp_output_buffer_show)
+	(replace_buffer_in_all_windows, init_window_once, init_window)
+	(syms_of_window, keys_of_window): Move from lisp.h.
+	* lisp.h: Move window.c declarations to window.h.
+
+	* bytecode.c: Include window.h.
+	* emacs.c: Include window.h.
+
+	* keyboard.c (make_lispy_event): Apply modifiers to multibyte-char key.
+	(keyremap): Add `parent' field.
+	(keyremap_step): Use it.  Remove `parent' argument.
+	(read_key_sequence): Setup and use the new `parent' field.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (adjust_point_for_property): Ensure termination.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (follow_key): Remove dead variable `did_meta'.
+	(access_keymap_keyremap, keyremap_step): New funs, extracted from the
+	duplicated handling of function-key-map and key-translation-map
+	in read_key_sequence.
+	(read_key_sequence): Use them.
+
+	* keyboard.c (adjust_point_for_property): Try harder to move point
+	to the non-sticky end of an invisible property.
+
+	* xdisp.c (single_display_prop_intangible_p): Make `space' display
+	property intangible as well.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xmenu.c (single_menu_item): Change last parameter to void* to
+	avoid warning.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (Fprin1_to_string): Instead of gcpro, set abort_on_gc.
+	Bind Qinhibit_modification_hooks to t so there will be no GC.
+	Rename local `tem' to `save_deactivate_mark'.
+
+	* eval.c (specpdl_ptr): Declare volatile.
+	(unbind_to): Copy the whole binding and decrement specpdl_ptr
+	before doing the work of unbinding it.
+
+	* lisp.h (struct specbinding): Declare elements volatile.
+	(specpdl_ptr): Declare volatile.
+
+	* Makefile.in (alloca.o): Specify -DDO_BLOCK_INPUT in compiling.
+
+	* alloca.c: Test DO_BLOCK_INPUT rather than `emacs'
+	for use of BLOCK_INPUT and inclusion of lisp.h and blockinput.h.
+
[phone]  Dave Love  <[e-mail]>
+
+	* coding.c (Vlast_coding_system_used): Doc fix.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* fileio.c (Ffile_symlink_p): Let handlers handle symlinks even
+	when system does not support them.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Qwrite_region_annotate_functions): New var.
+	(build_annotations): Use it to process the global part of the hook.
+	(syms_of_fileio): Init and staticpro it.
+
+	* keyboard.c (safe_run_hooks_error): Display a message instead of
+	silently ignoring the error.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (input_available_signal): Mark static.
+	(menu_bar_items): Use map_keymap.
+	(menu_bar_one_keymap): Remove.
+	(menu_bar_item): Adjust arglist (for use in map_keymap).
+	Properly hide a second binding when not both are keymaps.
+
+	* xmenu.c (struct skp): New struct, to pass args through map_keymap.
+	(single_keymap_panes): Use it and map_keymap.
+	(single_menu_item): Use skp as well.
+
+	* keymap.h (map_keymap_function_t): New type.
+	(map_keymap): Declare.
+
+	* keymap.c (map_keymap_item, map_keymap_char_table_item, map_keymap)
+	(map_keymap_call, Fmap_keymap): New functions.
+	(syms_of_keymap): Defsubr map-keymap.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (create_dialog, make_widget_for_menu_item)
+	(make_menu_item, create_menus, xg_update_menu_item): Don't call
+	..._with_mnemonic functions for menu items.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (coding_system_accept_latin_extra_p): Delete this
+	function.
+	(find_safe_codings): Pay attention to
+	the property tranlsation-table-for-encode of each codings.
+	(syms_of_coding): Give Qtranslation_table the extra slot number 2.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Funwind_protect): Use func=Fprogn rather than symbol=Qnil.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (unbind_to): Don't handle symbol = Qnil any more.
+
+	* lisp.h (CHECK): Wrap args in parenthesis.
+	(specbind): Fix doc: symbol = Qnil is not supported any more.
+
+	* bytecode.c (Fbyte_code) <unwind-protect>:
+	Use Fprogn rather than 0 and Qnil.
+
+	* keyboard.c (parse_modifiers_uncached): Parse `down', `drag',
+	`double', and `triple' modifiers as well.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (echo_char): Don't clear out a dash that follows a space.
+
+	* alloc.c (abort_on_gc): New variable.
+	(Fgarbage_collect): Abort if abort_on_gc is set.
+
+	* lisp.h (abort_on_gc): Add decl.
+
+	* eval.c (Fsignal): Clear abort_on_gc.
+
+	* editfns.c (Fformat): Set abort_on_gc during first scan of format.
+	Reinit FORMAT_START and END before second scan.
+
+	* xdisp.c (move_it_vertically_backward): Do the final big else
+	even if nlines is 0.
+
+	* xdisp.c (redisplay_internal): Finish the per-frame loop
+	even if redisplay is suspended by input.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (x_list_fonts): Return all fonts that match if
+	maxnames = -1.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* syntax.c (skip_chars): Fix previous change.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* syntax.c (skip_chars): Make the code faster by using the common
+	technique of *p, *stop, and *endp.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xdisp.c (update_tool_bar): BLOCK_INPUT before calling
+	tool_bar_items so GTK tool bar expose callback does not access items
+	being updated.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (Fapply): Undo last change and add a comment about why.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* data.c (Faset): Calculate nbytes earlier, to satisfy the now
+	pickier PARSE_MULTIBYTE_SEQ.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c (For, Fand, Fprogn, un_autoload, do_autoload):
+	Use XCDR, XCAR, CONSP.
+	(Fdefmacro): Fix docstring.  Use XCAR, XCDR.
+	(Fapply): Remove unnecessary GCPRO.
+
+	* doc.c (Fsubstitute_command_keys): Remove spurious casts.
+
+	* charset.h (PARSE_MULTIBYTE_SEQ): Pretend `length' is used.
+
+	* buffer.h: Don't hardcode BEG==1.
+
+	* abbrev.c (Fdefine_abbrev_table): Use XCAR, XCDR.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (try_window, try_window_reusing_current_matrix):
+	When at end of window, set window_end_pos to Z-ZV.
+
+	* buffer.c (Foverlay_recenter): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* dispnew.c (Fsit_For): Support XEmacs-style arg list.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (mac_check_for_quit_char): Don't check more often than
+	once a second.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_get_event): Don't handle SELECT_WINDOW_EVENT
+	specially, so that they can't hide an implicit switch-frame event.
+	(make_lispy_event): Handle SELECT_WINDOW_EVENT.
+	(head_table): Use switch-frame as event_kind for select-window.
+	(keys_of_keyboard): Don't bind [select-window] in special-event-map.
+
+	* editfns.c (Fformat): Lisp_Object/int mixup.
+	(format2): Remove unused var numargs.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Vafter_insert_file_adjust_coding_function): Delete.
+	(Qafter_insert_file_set_coding): New variable.
+	(syms_of_fileio): Initialize and staticpro it.  Delete declaration
+	for after-insert-file-adjust-coding-function.
+	(Finsert_file_contents): Call Qafter_insert_file_set_coding
+	instead of Vafter_insert_file_adjust_coding_function.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* lisp.h (temp_echo_area_glyphs): Adjust prototype.
+
+	* minibuf.c (temp_echo_area_glyphs): Change the arg to Lisp
+	string.  Callers changed.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Vafter_insert_file_adjust_coding_function): New variable.
+	(syms_of_fileio): Declare it as a lisp variable.
+	(Finsert_file_contents):
+	Call Vafter_insert_file_adjust_coding_function before calling
+	decode-format.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
+	get GtkAdjustment as widget now is a GtkRange.
+
+	* gtkutil.c (xg_create_scroll_bar): Connect to value-changed on
+	GtkRange to avoid memory leak.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xfaces.c (Vface_font_rescale_alist): New variable.
+	(struct font_name): New member rescale_ratio.
+	(font_rescale_ratio): New function.
+	(split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio.
+	(better_font_p): On comparing point sized, pay attention to
+	recale_ratio member of fonts.
+	(build_scalable_font_name): Reflect font->rescale_ratio in the
+	font name.
+	(syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable.
+
+	* lread.c (read1): Before calling index, check if the 2nd
+	arguemnt is in ASCII range.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Ffile_symlink_p): Doc fix.
+
+	* editfns.c (Fformat): Translate positions of text properties
+	in the format string to apply them to the result.
+
+	* fileio.c (Finsert_file_contents): Doc fix.
+	(syms_of_fileio) <after-insert-file-functions>: Doc fix.
+
[phone]  Ivan Zakharyaschev  <[e-mail]>  (tiny change)
+
+	* lread.c (openp): Get the Qfile_exists_p handler for STRING, not FN.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* mac.c (init_mac_osx_environment): Switch libexec and bin so
+	that self-contained application finds libexec files.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_region_unwind):
+	Set Vlast_coding_system_used to the argument.
+	(code_convert_region): If post-read-conversion function changed
+	the value of last-coding-sytem, keep the new value in
+	coding->symbol so that it won't be overridden.
+	(run_pre_post_conversion_on_str): Likewise.
+	(coding_system_accept_latin_extra_p): New function.
+	(find_safe_codings): Pay attention to characters registered in
+	latin-extra-code-table.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* Makefile.in (md5.o): Add missing dependency info.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xselect.c (x_handle_selection_request): Move UNGCPRO to very end.
+
+	* marker.c (verify_bytepos): New function.
+
+	* intervals.c (set_intervals_multibyte_1): When becoming
+	multibyte, adjust right and left child sizes to a whole set of
+	characters.  If an interval gets zero total-length, delete it.
+	If an interval consists of just its children, delete one of them.
+
+	* intervals.h (CHECK_TOTAL_LENGTH): New macro.
+	* intervals.c: Add many calls to CHECK_TOTAL_LENGTH.
+
+	* alloc.c (VALIDATE_LISP_STORAGE): Macro deleted.
+	All calls deleted.
+	(lisp_malloc): Do the work here directly.
+
[phone]  Gareth Jones  <[e-mail]>  (tiny change)
+
+	* fns.c (Flength): Return SUB_CHAR_TABLE_ORDINARY_SLOTS for sub
+	char tables.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* editfns.c (Fformat): Use a copy of FORMAT string so that we can
+	destructively change "%S" to "%s".
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (choose_face_font): Make sure *NEEDS_OVERSTRIKE is
+	always set.
+
[phone]  Dave Love  <[e-mail]>
+
+	* xfns.c (xpm_lookup_color): Grok "opaque".
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* frame.c (x_report_frame_params) [HAVE_CARBON]: Do not report
+	parent window ID.
+
+	* macfns.c (syms_of_macfns): Remove call to init_x_parm_symbols.
+
+	* macterm.h (struct mac_output): Define x_pixels_diff and
+	y_pixels_diff.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* makefile.w32-in ($(BLD)/frame.$(O)): Add dependency on
+	blockinput.h and files included from it.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidates the common code related to
+	frame-parameter handling from the xfns.c, w32fns.c, and macfns.c
+	files into frame.c.
+
+	* frame.c: Include blockinput.h.
+	(Vx_resource_name, Vx_resource_class, Qx_frame_parameter)
+	(Qx_resource_name, Qface_set_after_frame_default): Define vars here.
+	(Qauto_raise, Qauto_lower, ...): Define all frame parameter
+	related vars here.
+	(struct frame_parm_table, frame_parms): New table for describing
+	frame parameters and their associated Q-variable.
+	The order of the parameters corresponds to the sequence of the
+	frame_parm_handlers table in redisplay_interface.
+	(x_fullscreen_move, x_set_frame_parameters)
+	(x_report_frame_params, x_set_fullscreen, x_set_line_spacing)
+	(x_set_screen_gamma, x_set_font, x_set_fringe_width)
+	(x_set_border_width, x_set_internal_border_width, x_set_visibility)
+	(x_set_autoraise, x_set_autolower, x_set_unsplittable)
+	(x_set_vertical_scroll_bars, x_set_scroll_bar_width, x_icon_type):
+	Generic functions for processing of frame parameters.
+	(validate_x_resource_name, xrdb_get_resource, Fx_get_resource)
+	(display_x_get_resource, x_get_resource_string): Functions for
+	generic access to X resources.
+	(x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
+	(x_default_parameter, Fx_parse_geometry): Functions for generic
+	access to frame parameters.
+	(x_figure_window_size): Generic calculation of frame size.
+	Fixed to add space needed for tool bar.  Also setup size_hint_flags.
+	(syms_of_frame): Intern and staticpro frame parameter variables.
+	Defvar_lisp Vx_resource_class and Vx_resource_name here.
+	Defsubr Sx_get_resource and Sx_parse_geometry.
+
+	* frame.h (Qauto_raise, Qauto_lower, ...): Declare extern all frame
+	parameter related vars defined in frame.c.
+	(EMACS_CLASS): Define here.
+	(enum FULLSCREEN_*): Define here.
+	(x_set_scroll_bar_default_width, x_wm_set_icon_position)
+	(x_set_offset, x_new_font, x_new_fontset): Add prototypes.
+	(x_fullscreen_adjust, x_set_frame_parameters, x_report_frame_params)
+	(x_set_fullscreen, x_set_line_spacing, x_set_screen_gamma, x_set_font)
+	(x_set_fringe_width, x_set_border_width, x_set_internal_border_width)
+	(x_set_visibility, x_set_autoraise, x_set_autolower)
+	(x_set_unsplittable, x_set_vertical_scroll_bars)
+	(x_set_scroll_bar_width, x_icon_type, validate_x_resource_name)
+	(x_figure_window_size): Add prototypes.
+
+	* dispextern.h (frame_parm_handler): New typedef.
+	(struct redisplay_interface): New member frame_parm_handlers.
+	(enum resource_types): Move declaration here.
+	(x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg)
+	(x_default_parameter): Add prototypes.
+
+	* window.c: Remove extern decl for frame parameter vars.
+	(change_window_heights): New generic function;
+	replaces x_change_window_heights.  All users changed.
+
+	* window.h (change_window_heights): Add prototype.
+
+	* xfaces.c: Remove extern decl for frame parameter vars.
+
+	* xterm.h (EMACS_CLASS): Remove.  Use generic define.
+	(struct w32_display_info): Fix type of xrdb member.
+	(enum FULLSCREEN_*): Remove.
+	Remove prototypes for generic functions (in frame.h).
+
+	* xfns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
+	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.
+	(x_frame_parm_handlers): New table for redisplay_interface.
+	(syms_of_xfns): Don't intern/staticpro removed vars.
+
+	* xterm.c: Remove unnecessary extern declarations.
+	(x_fullscreen_adjust): Remove.  Use generic instead.
+	(x_redisplay_interface): Add x_frame_parm_handlers member.
+
+	* w32gui.h (XrmDatabase): New (dummy) typedef.
+
+	* w32term.h (EMACS_CLASS): Remove.  Use generic define.
+	(struct w32_display_info): Fix type of xrdb member.
+	(enum FULLSCREEN_*): Remove.
+	(x_fullscreen_adjust): Remove prototype.
+
+	* w32fns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
+	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.
+
+	* w32term.c: Remove unnecessary extern declarations.
+	(x_fullscreen_adjust): Remove.  Use generic instead.
+	(x_redisplay_interface): Add w32_frame_parm_handlers member.
+
+	* w32reg.c (x_get_string_resource): Use XrmDatabase.
+
+	* macgui.h (XrmDatabase): New (dummy) typedef.
+
+	* macterm.h (EMACS_CLASS): Remove.
+	(struct mac_display_info): Add xrdb member.
+	(struct mac_output): Add want_fullscreen member.
+
+	* macfns.c (Qauto_raise, Qauto_lower, ...): Remove vars for frame
+	parameters now defined in frame.h and frame.c.
+	(Vx_resource_name): Remove.  Use generic var.
+	(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).
+	(mac_frame_parm_handlers): New table for redisplay_interface.
+	(syms_of_macfns): Don't intern/staticpro removed vars.
+
+	* macterm.c: Remove unnecessary extern declarations.
+	(x_redisplay_interface): Add mac_frame_parm_handlers member.
+
+	* Makefile.in (frame.o): Add dependency on blockinput.h and files
+	included from it (atimer.h and systime.h).
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xdisp.c (x_insert_glyphs): Fix swapped width and height
+	parameters for shift_glyphs_for_insert.
+
+	* macterm.c (x_redisplay_interface): Add missing entry for
+	draw_vertical_window_border.
+
[phone]  Kai Gro,A_(Bjohann  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name): In the no-handler case, after
+	expanding, look again for a handler and invoke it.  This is needed
+	for filenames like "/foo/../user@host:/bar/../baz" -- the first
+	expansion produces "/user@host:/bar/../baz" which needs to be
+	expanded again for the finame result "/user@host:/baz".
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
+	of area to be redrawn for better performance.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (take_vertical_position_into_account): Remove.
+	(xt_action_hook): Call set_vertical_scroll_bar if needed.
+	(XM_SB_MIN, XM_SB_RANGE): Remove (min is now set to 0).
+	(xm_scroll_callback, x_create_toolkit_scroll_bar)
+	(x_set_toolkit_scroll_bar_thumb): Simplify.
+	(x_scroll_bar_expose): Only compile if !USE_TOOLKIT_SCROLL_BARS.
+	(XTread_socket): Remove unused var.
+	(x_make_frame_invisible): Replace goto with else.
+
+	* xdisp.c (set_vertical_scroll_bar): New fun.
+	(redisplay_window): Use it.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (update_tool_bar): Recompute tool bar if
+	update_mode_lines is set.  Set w->update_mode_line
+	only if the tool bar contents actually change.
+	(update_menu_bar): Undo previous change.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
+	(xg_frame_set_char_size): Calculate scroll bar width before frame
+	width.  Call SET_FRAME_GARBAGED and cancel_mouse_face.
+	(xg_separator_p): Check for all documented separator types.
+	(xg_update_scrollbar_pos): Variable gheight not needed, use height.
+	(update_frame_tool_bar): Don't call gdk_window_process_all_updates.
+
+	* xdisp.c (update_menu_bar): Set w->update_mode_line to Qt
+	so tool bar gets updated.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* data.c (store_symval_forwarding): Re-instate part of the code
+	that was deleted with too much enthusiasm.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* data.c (store_symval_forwarding): Delete special read-only
+	hack for type == -1, since we now use ->constant instead.
+	(Fkill_local_variable): Don't use XBUFFER if it can be nil.
+
+	* buffer.c (overlays_in): Declare static.
+	(syms_of_buffer) <enable-multibyte-characters>: Use the symbol's
+	`constant' field rather than the variable's `type' field.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* config.in [MAC_OSX]: Do not redefine bcopy, bzero, and bcmp.
+
+	* dispextern.h [HAVE_CARBON]: Include Carbon.h.
+
+	* fns.c [MAC_OSX]: Do not redefine vector.
+
+	* keyboard.c [MAC_OSX]: Handle SIGINT with interrupt_signal.
+
+	* macgui.h: Remove definition of No_Cursor.
+
+	* macterm.h: Include Carbon.h.  Replace (struct Cursor *) by Cursor.
+
+	* xdisp.c: Define No_Cursor.
+	(x_write_glyphs, notice_overwritten_cursor)
+	(draw_phys_cursor_glyph, note_mode_line_or_margin_highlight)
+	(note_mouse_highlight): Remove Mac-specific code.
+	(note_mouse_highlight): Use bcmp instead of == to compare Cursors.
+
[phone]  John Paul Wallington  <[e-mail]>
+
+	* xdisp.c (redisplay_window): If mini window's buffer is not
+	empty, then redisplay it like other windows.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* w32term.c (w32_draw_window_cursor): Fix last change.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* alloc.c (make_string_from_bytes, make_specified_string):
+	Add `const' for the arg CONTENTS.
+
+	* lisp.h (make_string_from_bytes, make_specified_string):
+	Prototypes adjusted.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xdisp.c (get_glyph_string_clip_rect): Remove ; at end of #endif
+
+	* gtkutil.h: Take two more arguments to xg_update_scrollbar_pos.
+	(XG_SB_RANGE): New define.
+
+	* gtkutil.c (xg_fixed_handle_expose): New function.
+	(xg_create_frame_widgets): Call xg_fixed_handle_expose for
+	expose events.
+	(xg_update_scrollbar_pos): Take two more arguments, left and width
+	of scroll bar including borders.
+	Clear left and right part outside scroll bar separately as some
+	themes have bars that are not an even number of pixels.
+	Don't set reallocate_redraws, don't call
+	gdk_window_process_all_updates.
+	(xg_set_toolkit_scroll_bar_thumb): Upper value is fixed,
+	so no need to change it.  Calculate size and value with XG_SB_RANGE.
+
+	* xterm.c (x_scroll_bar_create, XTset_vertical_scroll_bar):
+	Pass left and width of scroll bar including borders to
+	xg_update_scrollbar_pos.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* Makefile.in: Make sure space precedes end-of-line backslashes.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (pixel_to_glyph_coords, glyph_to_pixel_coords):
+	Add generic versions here.  Remove system specific versions
+	defined elsewhere.
+
+	* dispextern.h (pixel_to_glyph_coords, glyph_to_pixel_coords):
+	Add prototypes.
+
+	* xterm.h (STORE_NATIVE_RECT): New macro.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (get_glyph_string_clip_rect):
+	Use FRAME_INTERNAL_BORDER_WIDTH.
+
+	* dispextern.h (struct redisplay_interface): Add active_p
+	argument to draw_window_cursor member.  All uses changed.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidate code related to writing and
+	inserting glyphs, exposing frame, the tool bar, the mouse face,
+	the output cursor, and help echo from xterm.c, w32term.c and
+	macterm.c into xdisp.c.  It also generalizes the use of the
+	window_part enum instead of using numeric values throughout.
+
+	* xdisp.c: Consolidate gui-independent code here.
+	Include keymap.h.
+	(Qhelp_echo): Import.
+	(mouse_autoselect_window, x_stretch_cursor_p): Declare here.
+	(help_echo_string, help_echo_window, help_echo_object)
+	(previous_help_echo_string, help_echo_pos): Declare here.
+	(output_cursor, last_mouse_frame, last_tool_bar_item): Declare here.
+	(estimate_mode_line_height): Define here.  Handle windowing
+	systems directly (without using estimate_mode_line_height_hook).
+	(x_y_to_hpos_vpos, get_tool_bar_item, note_tool_bar_highlight):
+	(update_window_cursor, update_cursor_in_window_tree)
+	(fast_find_position, fast_find_string_pos)
+	(note_mode_line_highlight, note_mode_line_or_margin_highlight)
+	(expose_area, expose_line, expose_overlaps, expose_window)
+	(expose_window_tree, phys_cursor_in_rect_p): New generic versions;
+	declared static as they are only used locally in xdisp.c.
+	(draw_glyphs): Rename from x_draw_glyphs and make static.
+	(tool_bar_item_info, notice_overwritten_cursor): Make static.
+	(frame_to_window_pixel_xy, get_glyph_string_clip_rect)
+	(set_output_cursor, x_cursor_to, handle_tool_bar_click)
+	(x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
+	(x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
+	(display_and_set_cursor, x_update_cursor, x_clear_cursor)
+	(show_mouse_face, clear_mouse_face, cursor_in_mouse_face_p)
+	(note_mouse_highlight, x_clear_window_mouse_face)
+	(cancel_mouse_face, x_draw_vertical_border, expose_frame)
+	(x_intersect_rectangles): New generic functions for use by xdisp.c
+	and GUI front-ends.
+	(syms_of_xdisp): Initialize and staticpro help_echo* variables.
+	Defvar_bool "x-streach-cursor" and "mouse-autoselect-window" here.
+
+	* dispextern.h (Display_Info): Generic typedef for *_display_info.
+	(NativeRectangle): Generic typedef for rectangle type.
+	(enum window_part): Move here from window.c.
+	(struct redisplay_interface): New members flush_display_optional,
+	define_frame_cursor, clear_frame_area, draw_window_cursor,
+	draw_vertical_window_border, shift_glyphs_for_insert.
+	Rename member clear_mouse_face to clear_window_mouse_face.
+	(estimate_mode_line_height_hook): Remove hook.
+	(auto_raise_tool_bar_buttons_p): Don't declare extern.
+	(tool_bar_item_info): Remove prototype.
+	(help_echo_string, help_echo_window, help_echo_object)
+	(previous_help_echo_string, help_echo_pos)
+	(last_mouse_frame, last_tool_bar_item, mouse_autoselect_window):
+	(x_stretch_cursor_p, output_cursor): Declare extern.
+	(x_draw_glyphs, notice_overwritten_cursor): Remove prototypes.
+	(x_write_glyphs), x_insert_glyphs, x_clear_end_of_line)
+	(x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
+	(display_and_set_cursor, set_output_cursor, x_cursor_to)
+	(x_update_cursor, x_clear_cursor, x_draw_vertical_border)
+	(frame_to_window_pixel_xy, get_glyph_string_clip_rect)
+	(note_mouse_highlight, x_clear_window_mouse_face, cancel_mouse_face)
+	(handle_tool_bar_click, clear_mouse_face, show_mouse_face)
+	(cursor_in_mouse_face_p, expose_frame, x_intersect_rectangles):
+	Add prototypes.
+	(mode_line_string, marginal_area_string): Fix prototypes.
+
+	* window.c (enum window_part): Move to dispextern.h.
+	(coordinates_in_window): Use enum window_part member names
+	instead of numbers to describe return value.
+	(struct check_window_data): Change part member to window_part.
+	(check_window_containing): Return window_part unaltered.
+	(window_from_coordinates): Change part arg from int to enum
+	window_part.  Allow part arg to be null.  All users changed.
+
+	* window.h (window_from_coordinates): Fix prototype.
+
+	* term.c (estimate_mode_line_height): Move to xdisp.c.
+
+	* keyboard.c (make_lispy_event): Use enum window_part.
+
+	* dispnew.c (mode_line_string, marginal_area_string): Use enum
+	window_part instead of int in arg list.  Users changed.
+
+	* xterm.h (No_Cursor): Declare as None for X.
+	(struct mac_output): Replace member cross_cursor by hand_cursor.
+
+	* xterm.c: Remove consolidated defines and code.
+	(BETWEEN): Remove unused macro.
+	(x_draw_vertical_window_border, x_shift_glyphs_for_insert)
+	(x_define_frame_cursor, x_clear_frame_area)
+	(x_draw_window_cursor): New X-specific functions for RIF.
+	(x_redisplay_interface): Add new members.
+
+	* xfns.c: Setup and use hand_cursor instead of cross_cursor.
+
+	* w32term.h (struct w32_output): Remove cross_cursor member.
+
+	* w32term.c: Remove consolidated defines and code.
+	(BETWEEN): Remove unused macro.
+	(w32_draw_vertical_window_border, w32_shift_glyphs_for_insert)
+	(w32_define_frame_cursor, w32_clear_frame_area)
+	(w32_draw_window_cursor): New W32-specific functions for RIF.
+	(w32_redisplay_interface): Add new members.
+
+	* w32gui.h (No_Cursor): Define as 0 for W32.
+	(XRectangle): Add X compatible rectangle type.
+	(NativeRectangle): Declare as RECT for W32.
+	(CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
+
+	* w32fns.c: Remove setup of cross_cursor (already has hand_cursor).
+
+	* w32console.c: Remove consolidated defines and code.
+
+	* msdos.h (Display_Info): Add generic typedef.
+
+	* msdos.c: Remove consolidated defines and code.
+	(IT_note_mouse_highlight, dos_rawgetc): Use enum window_part.
+
+	* macterm.h (struct mac_output): Replace member cross_cursor by
+	hand_cursor.
+	(activate_scroll_bars, deactivate_scroll_bars): Add prototypes.
+
+	* macterm.c: Remove consolidated defines and code.
+	(BETWEEN): Remove unused macro.
+	(mac_draw_vertical_window_border, mac_shift_glyphs_for_insert)
+	(mac_define_frame_cursor, mac_clear_frame_area)
+	(mac_draw_window_cursor): New Mac-specific functions for RIF.
+	(x_redisplay_interface): Add new members.
+
+	* macgui.h (No_Cursor): Define as 0 for Mac.
+	(XRectangle): Add X compatible rectangle type.
+	(NativeRectangle): Declare as Rect for Mac.
+	(CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.
+
+	* macfns.c (x_set_mouse_color): Setup hand_cursor.
+	(x_set_cursor_color): Use x_display_and_set_cursor.
+
+	* Makefile.in (xdisp.o): Add dependency on blockinput.h and files
+	included from it.  Add dependency on keymap.h.
+
+	* makefile.w32-in (xdisp.o): Add dependency on keymap.h.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Fexpand_file_name): Fix previous change.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fileio.c (Ffile_name_directory): Reconstruct file name by
+	make_specified_string.
+	(Ffile_name_nondirectory, Ffile_name_as_directory)
+	(Fdirectory_file_name, Fexpand_file_name)
+	(Fsubstitute_in_file_name): Likewise.
+	(Fread_file_name): Compare decoded homedir with DIR and
+	DEFAULT_FILENAME.
+
+	* alloc.c (make_specified_string): If NCHARS is negative, count
+	the number of characters.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_frame_cleared): Call gtk_widget_queue_draw for
+	all widgets.
+
+	* gtkutil.h: Removed xg_ignore_next_thumb.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Vchar_coding_system_table): Remove this variable.
+	(Vcoding_system_safe_chars): New variable.
+	(intersection): Remove this function.
+	(find_safe_codings): Don't use Vchar_coding_system_table, but try
+	all codings in SAFE_CODINGS.
+	(Ffind_coding_systems_region_internal): Adjust for the change of
+	find_safe_codings.  Get generic coding systems from
+	Vcoding_system_safe_chars.
+	(Fdefine_coding_system_internal): New function.
+	(syms_of_coding): Defsubr Sdefine_coding_system_internal.
+	Initialize and staticpro Vcoding_system_safe_chars.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
+	equal old values before updating.
+
+	* xterm.c (xg_scroll_callback): Remove xg_ignore_next_thumb.
+
+	* gtkutil.c (xg_initialize): Remove xg_ignore_next_thumb.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c: Removed handle_fixed_child, struct xg_last_sb_pos.
+	(xg_resize_widgets): Don't call foreach(handle_fixed_child).
+	(xg_gtk_scroll_destroy): Remove free of struct xg_last_sb_pos.
+	(scroll_bar_button_cb): Set bar->dragging to NIL on button release.
+	(xg_create_scroll_bar): Pass bar to button event callback.
+	(xg_find_top_left_in_fixed): New function.
+	(xg_update_scrollbar_pos): Don't call gdk_window_clear on
+	whole scroll bar area.  Get old position with
+	xg_find_top_left_in_fixed, calculate and only clear needed areas.
+	(xg_set_toolkit_scroll_bar_thumb): Do not adjust scroll bar if
+	dragging is in progress.  Calculate whole as for Motif.
+	Remove code that saved last values.  Call gtk_range functions to
+	set scroll bar sizes.
+
+	* gtkutil.h: Removed xg_ignore_next_thumb.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* makefile.w32-in ($(BLD)/xdisp.$(O)): Add dependency on blockinput.h
+	and files included from it.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (accessible_keymaps_1): Break cycles but without preventing
+	multiple occurrences of the same keymap under different prefixes.
+	(Faccessible_keymaps): Remove code redundant since rev 1.82.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32gui.h: Use HDC for Display.
+
+	* w32term.c (w32_encode_char): Prevent double-byte chars from
+	crashing Emacs.
+
+	* w32fns.c (jpeg_load, png_load, slurp_file): Read image files
+	as binary.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (x_produce_glyphs): Use FRAME_BASELINE_OFFSET.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidate some of the gui-independent
+	parts of the processing and drawing of "glyph strings" from
+	xterm.c, w32term.c, and macterm.c into xdisp.c.
+
+	* dispextern.h (struct glyph): Reduce face_id member from 22 to
+	21 bits (this reduces number of faces from 4M to 2M).
+	Replace W32 specific w32_font_type member (2 bits) by generic
+	font_type member (3 bits) for portability.
+	(FONT_TYPE_UNKNOWN): New define, default for font_type member.
+	(enum draw_glyphs_face): Define here.
+	(struct glyph_string): Define here.  Merge W32 and X versions.
+	(struct redisplay_interface): New members per_char_metric,
+	encode_char, compute_glyph_string_overhangs, draw_glyph_string.
+	(VCENTER_BASELINE_OFFSET): Define here.
+	(dump_glyph_string, x_get_glyph_overhangs, x_produce_glyphs)
+	(x_draw_glyphs, notice_overwritten_cursor): Declare prototypes here.
+
+	* xdisp.c: Consolidate gui-independent "glyph string" code here.
+	(dump_glyph_string): Moved here.
+	(init_glyph_string, append_glyph_string_lists, append_glyph_string)
+	(prepend_glyph_string_lists, get_glyph_face_and_encoding)
+	(fill_composite_glyph_string, fill_glyph_string)
+	(fill_image_glyph_string, fill_stretch_glyph_string)
+	(left_overwritten, left_overwriting, right_overwritten)
+	(right_overwriting, get_char_face_and_encoding)
+	(set_glyph_string_background_width, compute_overhangs_and_x)
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(take_vertical_position_into_account, append_stretch_glyph)
+	(produce_stretch_glyph): New generic functions (based on X version).
+	Call platform specific functions through rif.
+	(INIT_GLYPH_STRING): New macro, hides W32 details.
+	(BUILD_STRETCH_GLYPH_STRING, BUILD_IMAGE_GLYPH_STRING)
+	(BUILD_CHAR_GLYPH_STRINGS, BUILD_COMPOSITE_GLYPH_STRING)
+	(BUILD_GLYPH_STRINGS): Generic macros (based on X version).
+	(x_draw_glyphs, x_get_glyph_overhangs, x_produce_glyphs)
+	(notice_overwritten_cursor):
+	Generic functions exported to platform modules.  Users changed.
+
+	* xterm.h (FONT_DESCENT, FRAME_X_OUTPUT, FRAME_BASELINE_OFFSET)
+	(FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE)
+	(STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2):
+	New macros for consolidated code.
+
+	* xterm.c: Remove consolidated defines and code.
+	(x_per_char_metric, x_encode_char)
+	(x_compute_glyph_string_overhangs): Adapt to RIF requirements.
+	(x_redisplay_interface): Add new members.
+
+	* w32gui.h (Display): Add dummy typedef for consolidation.
+	(XChar2b): Define alias for wchar_t for consolidation.
+	(STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): New macros.
+
+	* w32term.h (FRAME_X_OUTPUT, FRAME_X_WINDOW, FRAME_X_DISPLAY)
+	(FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
+	New macros for consolidation.
+
+	* w32term.c: Remove consolidated defines and code.
+	(BUILD_WCHAR_T, BYTE1, BYTE2): Macros removed; callers changed
+	to use STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2 instead.
+	(w32_per_char_metric): Change font_type arg to int for RIF.
+	(w32_encode_char): Return int according to RIF requirements.
+	(w32_compute_glyph_string_overhangs): Adapt to RIF.
+	(w32_get_glyph_overhangs): New function for RIF.  Uses generic
+	x_get_glyph_overhangs.
+	(w32_redisplay_interface): Add new members.
+
+	* macgui.h (XChar2b): Move typedef here for consolidation.
+	(STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): New macros.
+
+	* macterm.h (FRAME_X_OUTPUT, FRAME_X_WINDOW, FRAME_X_DISPLAY):
+	(FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): New macros for
+	consolidation.
+
+	* macterm.c: Remove consolidated defines and code.
+	(mac_per_char_metric): New function for RIF.
+	(mac_encode_char): Adapt to new RIF requirements.
+	(mac_compute_glyph_string_overhangs): Adapt for RIF.
+	(x_redisplay_interface): Add new members.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (Vmenu_events): New var.
+	(syms_of_keymap): Initialize it.
+	(where_is_internal): Check more carefully what is a menu event.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (read1): After #!, exit loop on eof.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.h: Add declaration for xg_frame_cleared.
+
+	* xterm.c (x_clear_frame): Call xg_frame_cleared for GTK.
+
+	* gtkutil.c (struct xg_last_sb_pos): New structure.
+	(handle_fixed_child): New function.
+	(xg_resize_widgets): Call handle_fixed_child on all scroll bar widgets
+	and force a redraw on them.
+	(xg_gtk_scroll_destroy): Free struct xg_last_sb_pos also.
+	(xg_create_scroll_bar): Add struct xg_last_sb_pos to scroll bar
+	so we can avoid unneeded redraws.
+	(xg_update_scrollbar_pos): Invalidate data in xg_last_sb_pos
+	and force a redraw on the scroll bar.
+	(xg_set_toolkit_scroll_bar_thumb): Do not change/redraw scroll bar
+	if xg_last_sb_pos shows the positions are up to date.
+	(xg_frame_cleared): New function.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Fdetect_coding_region): Fix docstring.
+	(Fdetect_coding_string): Fix docstring.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* gtkutil.c: Add prototype for create_menus.
+
+	* data.c (long_to_cons): Fix type of top.
+
+	* xselect.c (selection_data_to_lisp_data): Use int instead of
+	long for an integer of size 4.
+
+	* gtkutil.c (xg_update_frame_menubar): Add missing return value.
+	(xg_tool_bar_help_callback): Likewise.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xterm.c (x_term_init) [USE_GTK]: Fix typo.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidate the fringe handling from
+	xterm.c, w32term.c, and macterm.c into xdisp.c.
+
+	* xdisp.c: Consolidate fringe handling code here.
+	(left_bits, right_bits, continued_bits, continuation_bits)
+	(ov_bits, zv_bits): Define fringe bitmaps.
+	(fringe_bitmaps): New array holding fringe bitmaps.
+	(draw_fringe_bitmap): Draw a specific bitmap; call display
+	specific drawing routine via rif->draw_fringe_bitmap.
+	(draw_row_fringe_bitmaps): Generic replacement for
+	x_draw_row_fringe_bitmaps; all callers changed.
+	(compute_fringe_widths): Generic replacement for
+	x_compute_fringe_widths; all callers changed.
+
+	* dispextern.h (enum fringe_bitmap_type): Define here.
+	(struct fringe_bitmap, struct draw_fringe_bitmap_params): New.
+	(fringe_bitmaps): Declare extern.
+	(struct redisplay_interface): New member draw_fringe_bitmap.
+	(draw_row_fringe_bitmaps, compute_fringe_widths): Declare extern.
+
+	* xterm.c: Remove generic fringe code.
+	(x_draw_fringe_bitmap): Only perform actual fringe drawing.
+	(x_redisplay_interface): Add x_draw_fringe_bitmap member.
+
+	* w32term.c: Remove generic fringe code.
+	(w32_draw_fringe_bitmap): Only perform actual fringe drawing.
+	(w32_redisplay_interface): Add w32_draw_fringe_bitmap member.
+
+	* macterm.c: Remove generic fringe code.
+	(x_draw_fringe_bitmap): Only perform actual fringe drawing.
+	(x_redisplay_interface): Add x_draw_fringe_bitmap member.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* print.c (Fprin1_to_string): Return unibyte string if possible.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* process.c (read_process_output): We have allocated enough space
+	for readmax and carryover, so actually use the alloted space.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* keyboard.c (make_lispy_event): Extend mouse_syms if needed for
+	toolkit scrollbar click.
+
+	* xterm.c (x_window_to_scroll_bar): Call xg_get_scroll_id_for_window
+	for USE_GTK.
+	(x_scroll_bar_handle_click): Use this function for toolkit scrollbars
+	also.
+	(handle_one_xevent): ButtonPress/Release: If event is for a toolkit
+	scrollbar and control is pressed, call x_scroll_bar_handle_click.
+
+	* gtkutil.h (xg_get_scroll_id_for_window): Declare.
+
+	* gtkutil.c (xg_get_scroll_id_for_window): New function.
+	(xg_tool_bar_item_expose_callback): New function.
+	(xg_tool_bar_expose_callback): Call update_frame_tool_bar.
+	(xg_create_tool_bar): Connect xg_tool_bar_expose_callback to expose
+	on the tool bar widget.
+	(update_frame_tool_bar): Connect xg_tool_bar_item_expose_callback
+	to expose on the tool bar item widgets.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
+	struct image* when deciding to update (struct image* may have been
+	deleted from the image cache).
+
+	* xterm.c (handle_one_xevent): Pass ReparentNotify to Xt even if
+	the event isn't for a frame (i.e. for dialogs).
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (CODING_ADD_COMPOSITION_COMPONENT): If the number of
+	composition components reaches the limit, terminate composing.
+	(COMPOSITION_OK): New macro.
+	(detect_coding_iso2022): Use it if an escape sequence for
+	composition is found.
+	(coding_restore_composition): Adjust the number of composition
+	components if it is not sane.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* w32term.h (struct w32_display_info): Add xrdb member to support
+	passing resources via -xrm on Windows.
+
+	* w32term.c (w32_make_rdb): New function.
+	(w32_term_init): Use it to initialize xrdb member of w32_display_info
+	struct.  Delete leftover code.
+
+	* w32fns.c (Fx_get_resource, x_get_resource_string): Pass xrdb to check
+	for resources passed on the command line.
+
+	* w32reg.c (w32_get_rdb_resource): New function.
+	(x_get_string_resource): Use it, so resources passed with -xrm
+	supercede the ones in the registry.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_detect_focus_change): Call x_any_window_to_frame
+	instead of x_top_window_to_frame.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xsmfns.c (smc_save_yourself_CB): Add --no-splash to options
+	when restarting Emacs.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fkill_buffer): Use Frun_hook_with_args_until_failure
+	to run kill-buffer-query-functions.
+	(Qkill_buffer_query_functions): New var.
+	(syms_of_buffer): Init and staticpro it.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.h (XSync): Define as gdk_window_process_all_updates for GTK.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_window): Fix infinite loop in redisplay.
+	If centering point failed to make whole line visible and vscroll
+	is non-zero, disable vscroll and try centering point again.
+
+	* lread.c (read1): Accept `single space' syntax like (? x).
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* keyboard.c (cancel_hourglass_unwind): Surround with
+	#ifdef HAVE_X_WINDOWS
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* buffer.c (Fset_buffer_multibyte): Pay attention to the buffer
+	process only when "subprocesses" is defined.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (back_comment): Only check nestedness of 2nd char if needed.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* callint.c (fix_command): Declare as static void and move before
+	Fcall_interactively.
+
+	* xdisp.c (Qwhen): Declare external; it's now defined in callint.c.
+	(syms_of_xdisp): Don't initialize Qwhen.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* keyboard.c (cancel_hourglass_unwind): New function.
+	(command_loop_1): Cancel hourglass with unwind-protect.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* callint.c (fix_command): New subroutine, from Fcall_interactively.
+	Detect (when ... (region-beginning)) etc.
+	(Fcall_interactively): Call fix_command.
+	(Qif, Qwhen): New variables.
+	(syms_of_callint): Init and staticpro them.
+
+	* regex.c (print_partial_compiled_pattern): Output to stderr.
+
[phone]  Kai Gro,A_(Bjohann  <[e-mail]>
+
+	* dired.c (directory_files_internal): Don't expand directory.
+	(Fdirectory_files, Fdirectory_files_and_attributes): Do it here
+	instead.  From Lars Hansen <[e-mail]>.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fns.c (string_to_multibyte): Remove unused var i.
+	(Flanginfo): Fix int/Lisp_Object mixup.
+	(void_call2): New fun.
+	(Fmap_char_table): Use it in place of call2.
+
+	* xfaces.c (x_face_list_fonts): Fix int/Lisp_Object mixup.
+
+	* macros.c (Fstart_kbd_macro): Remove redundant assignment.
+
+	* keymap.c (copy_keymap_1): Make it static.
+
+	* alloc.c (Fgarbage_collect): Don't use XSETFLOAT.
+
[phone]  David Ponce  <[e-mail]>
+
+	* lread.c (Fload): Don't check STRING_MULTIBYTE.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* process.h: Removed subtty field from struct Lisp_Process.
+
+	* process.c (create_process): Remove setting of subtty.
+	(emacs_get_tty_pgrp): New function.
+	(Fprocess_running_child_p, process_send_signal):
+	Call emacs_get_tty_pgrp instead of ioctl.
+	(process_send_signal): Call EMACS_KILLPG if ioctl TIOCSIGSEND fails.
+
[phone]  Kai Gro,A_(Bjohann  <[e-mail]>
+
+	* keymap.c (Fdefine_key): Doc fix.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	Port of patch for RC by Klaus Zeitler <[e-mail]>.
+
+	* s/hpux10.h: Define POLL_INTERRUPTED_SYS_CALL, not
+	POLLING_PROBLEM_IN_SELECT.
+
+	* s/hpux11.h: Include hpux10-20.h instead of hpux10.h.
+	Delete #undef of POLLING_PROBLEM_IN_SELECT.
+
+	* s/hpux10-20.h: New file.
+
+	* process.c (wait_reading_process_input):
+	Use POLL_INTERRUPTED_SYS_CALL, not POLLING_PROBLEM_IN_SELECT.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (check_fontset_name): If NAME is nil, return the
+	default fontset.
+	(override_font_info): New function.
+	(Fset_fontset_font): Document that NAME nil means the default fontset.
+	(Ffontset_info): If FONTSET is not the default fontset, merge
+	FONTSET onto the copy of the default fontset, and work on that
+	copy.  Document that NAME nil means the default fontset.
+	(Ffontset_font): Document that NAME nil means the default fontset.
+
+	* process.c (setup_process_coding_systems): If the process's
+	in/out descriptor is -1, do nothing.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* lisp.h (Fcancel_kbd_macro_events, Fstring_to_multibyte):
+	Add prototypes.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xfaces.c (try_alternative_families): Try all scalable fonts if
+	Vscalable_fonts_allowed is not Qt.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (x_list_fonts): If maxnames is less than 0, get all font
+	names.
+
+	* xfaces.c (x_face_list_fonts): Allocate struct font_name here.
+	(sorted_font_list): Move allocation of struct font_name to
+	x_face_list_fonts.
+	(Fx_font_family_list): Set font-list-limit to -1 to get all font names.
+	(Fx_list_fonts): Set maxnames to -1 to get all font names.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lread.c (read1): Fix last change.
+	"`" is not always special.  Allow "?" after a character constant.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* unexmacosx.c (copy_data_segment): Also copy __cfstring section.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based): Move outside a
+	multi-glyph character before setting new window start.
+
+	* xdisp.c (in_display_vector_p): New function.
+	* dispextern.h (in_display_vector_p): Declare.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* lread.c (read1): Fix and relax read syntax.
+	Recognize "[", ";", "#", and "?" after a dotted-pair dot.
+	Only recognize "," after dotted-pair dot if inside backquote.
+	Never include "`" or "," (inside backquote) in a symbol.
+	Allow dotted-pair dot after a character constant.
+	Allow "`" and "," (inside backquote) after a character constant.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* gtkutil.c (xg_tool_bar_expose_callback): New function.
+	(xg_create_tool_bar): Force style of tool bar to be horizontal with
+	icons.	Set name of tool bar to emacs-toolbar.
+	(update_frame_tool_bar): Connect expose event to
+	xg_tool_bar_expose_callback.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (this_command_key_count_reset): New variable.
+	Initiatize to 0 where this_command_key_count is set.
+	(read_char): Save and restore this_command_key_count_reset
+	around input method code.
+	(read_char): If this_command_key_count_reset, echo reread commands.
+	(Freset_this_command_lengths): Set this_command_key_count_reset to 1.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fns.c (string_to_multibyte): Always return a multibyte string.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (w32_list_bdf_fonts, w32_list_fonts):
+	Negative max_fonts parameter means list all.
+
[phone]  Dave Love  <[e-mail]>
+
+	* fns.c (Flanginfo): Doc fix.
+
 2003-02-13  Kim F. Storm  <[e-mail]>
 
 	* lread.c (read_escape): Interpret \s as a SPACE character, except
@@ -8,7 +14557,7 @@
 	* search.c (Fmatch_data): Doc fix.  Explicitly state that
 	match-data is undefined if last search failed.
 
-	* keymap.c (Fcommand_remapping): Renamed from Fremap_command.
+	* keymap.c (Fcommand_remapping): Rename from Fremap_command.
 	All uses changed.
 
 2003-02-12  Juanma Barranquero  <[e-mail]>
@@ -40,8 +14589,8 @@
 
 	* process.c (QCfilter_multibyte): New variable.
 	(setup_process_coding_systems): New function.
-	(Fset_process_buffer, Fset_process_filter): Call
-	setup_process_coding_systems.
+	(Fset_process_buffer, Fset_process_filter):
+	Call setup_process_coding_systems.
 	(Fstart_process): Initialize the member `filter_multibyte' of
 	struct Lisp_Process.
 	(create_process): Call setup_process_coding_systems.
@@ -86,13 +14635,12 @@
 
 	* xmenu.c (menu_position_func): Adjust menu popup position so that
 	the menu is fully visible.
-	
 
 2003-02-07  Jan Dj,Ad(Brv  <[e-mail]>
 
 	* xterm.c (x_text_icon, x_raise_frame, x_lower_frame)
-	(x_make_frame_invisible, x_wm_set_icon_position): Use
-	FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif.
+	(x_make_frame_invisible, x_wm_set_icon_position):
+	Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif.
 
 	* xfns.c (x_set_name, x_set_title): Ditto.
 
@@ -129,7 +14677,7 @@
 	[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.
+	(xpm_load): Sync with xfns.c.  Adapt for Windows version of libXpm.
 	(init_external_image_libraries): Try to load libXpm.dll.
 
 	* fileio.c (Fcopy_file) [WINDOWSNT]: Reverse logic for setting
@@ -158,8 +14706,8 @@
 	* w32fns.c (DrawText): Kludge to avoid a redefinition on Windows
 	when including gif_lib.h.
 	(init_gif_functions, init_tiff_functions): New functions.
-	(gif_load, tiff_load): Sync with xfns.c version. Adjust colors for
-	Windows. Disable color table lookups. Call library functions
+	(gif_load, tiff_load): Sync with xfns.c version.  Adjust colors for
+	Windows.  Disable color table lookups.  Call library functions
 	through pointers determined at runtime.
 	(init_external_image_libraries): Try to load libungif.dll and
 	libtiff.dll.
@@ -167,12 +14715,11 @@
 2003-01-31  Kenichi Handa  <[e-mail]>
 
 	* xdisp.c (SKIP_GLYPHS): New macro.
-	(set_cursor_from_row): Skip all glyphs that comes from overlay
-	string.
+	(set_cursor_from_row): Skip all glyphs that comes from overlay string.
 
 2003-01-30  Jan Dj,Ad(Brv  <[e-mail]>
 
-	* gtkutil.c (free_frame_tool_bar): Removed debug printf.
+	* gtkutil.c (free_frame_tool_bar): Remove debug printf.
 
 2003-01-30  Dave Love  <[e-mail]>
 
@@ -226,8 +14773,8 @@
 
 	* w32fns.c (init_jpeg_functions, jpeg_resync_to_restart_wrapper):
 	New functions.
-	(jpeg_load): Sync with xfns.c version. Adjust colors for Windows.
-	Disable color table lookups. Call jpeg library 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.
 
@@ -264,8 +14811,8 @@
 
 	* w32fns.c (XPutPixel): Handle monochrome images; used for masks.
 	[HAVE_PNG]: Sync with xfns.c version.
-	(png_load): Adjust colors for Windows. Use Windows
-	bitmaps. Disable color table lookups.
+	(png_load): Adjust colors for Windows.  Use Windows
+	bitmaps.  Disable color table lookups.
 	(DEF_IMGLIB_FN, LOAD_IMGLIB_FN): New macros.
 	(init_png_functions): New function.
 	(png_read_from_memory, png_load): Call png library functions
@@ -294,8 +14841,7 @@
 2003-01-24  Kenichi Handa  <[e-mail]>
 
 	* keyboard.c (adjust_point_for_property): New second arg MODIFIED.
-	It it is nonzero, don't pretend that an invisible area doesn't
-	exist.
+	It it is nonzero, don't pretend that an invisible area doesn't exist.
 	(command_loop_1): Call adjust_point_for_property with proper
 	second arg.
 
@@ -326,8 +14872,8 @@
 	(notice_overwritten_cursor): Consider the cursor image erased if
 	the output area intersects the cursor image in y-direction.
 
-	* w32term.c (note_mode_line_or_margin_highlight): Renamed from
-	note_mode_line_highlight and extended.
+	* w32term.c (note_mode_line_or_margin_highlight): Rename from
+	note_mode_line_highlight and extend.
 
 	* w32term.c (last_window): New variable.
 	(w32_read_socket) <WM_MOUSEMOVE>: Generate SELECT_WINDOW_EVENTs.
@@ -352,8 +14898,8 @@
 	add function w32_define_cursor.
 	(show_mouse_face): Delete #if 0 to enable function w32_define_cursor
 	and change member name output_data.x to output_data.w32.
-	(w32_initialize_display_info): Setup
-	dpyinfo->vertical_scroll_bar_cursor.
+	(w32_initialize_display_info):
+	Setup dpyinfo->vertical_scroll_bar_cursor.
 
 	* w32fns.c (Vx_hand_shape): New variable.
 	(w32_wnd_proc): Add message entries for WM_SETCURSOR and
@@ -363,9 +14909,9 @@
 2003-01-21  David Ponce  <[e-mail]>
 
 	* w32term.c (w32_encode_char): For DIM=1 charset, set
-	ccl->reg[2] to -1 before calling ccl_driver. (Sync. with xterm.c
-	x_encode_char change by Kenichi Handa <[e-mail]> on
-	2002-09-30.)
+	ccl->reg[2] to -1 before calling ccl_driver.
+	(Sync. with xterm.c x_encode_char change by Kenichi Handa
+	<[e-mail]> on 2002-09-30.)
 	(w32_draw_relief_rect): Declare all args.
 	(w32_define_cursor): New.
 
@@ -373,7 +14919,7 @@
 	(w32_init_class): Use it.
 	(x_put_x_image): Declare all args.
 
-2003-01-21  Richard Dawe  <[e-mail]>  (tiny change)
[phone]  Richard Dawe  <[e-mail]>
 
 	* Makefile.in (ALL_CFLAGS): Include MYCPPFLAGS, not MYCPPFLAG.
 
@@ -407,7 +14953,7 @@
 
 2003-01-20  Steven Tamm  <[e-mail]>
 
-	* macterm.c (XTread_socket): Checks for valid, visible window
+	* macterm.c (XTread_socket): Check for valid, visible window
 	before sending a scroll-wheel event.
 
 2003-01-20  Richard M. Stallman  <[e-mail]>
@@ -443,7 +14989,7 @@
 	(FRAME_OUTER_TO_INNER_DIFF_Y): Add FRAME_TOOLBAR_HEIGHT to calculation.
 
 	* xterm.c: Include gtkutil.h for USE_GTK.
-	Declare extern void free_frame_menubar for USE_GTK.
+	(free_frame_menubar): Declare extern void for USE_GTK.
 	(note_mouse_highlight): Check popup_activated for USE_GTK.
 	(xt_action_hook): Don't compile if USE_GTK.
 	(x_scroll_bar_to_input_event): Use CurrentTime for USE_GTK.
@@ -472,24 +15018,24 @@
 
 	* xmenu.c: Include gtkutil.h for USE_GTK.
 	(Fx_popup_menu): Use current position if x and y is NIL.
-	(single_menu_item, single_menu_item, Fx_popup_dialog): Check
-	for USE_GTK.
+	(single_menu_item, single_menu_item, Fx_popup_dialog):
+	Check for USE_GTK.
 	(popup_widget_loop): New function for USE_GTK.
 	(x_activate_menubar): Add code for USE_GTK.
 	(popup_activate_callback, popup_deactivate_callback)
-	(menu_highlight_callback, menubar_selection_callback): USE_GTK versions
-	added.
+	(menu_highlight_callback, menubar_selection_callback):
+	Add USE_GTK versions.
 	(update_frame_menubar): Call xg_update_frame_menubar for USE_GTK.
 	(set_frame_menubar): Call xg_modify_menubar_widgets for USE_GTK.
 	(free_frame_menubar): Only compile if not USE_GTK.  GTK version
 	is in gtkutil.c.
 	(popup_selection_callback): New version for USE_GTK.
 	(create_and_show_popup_menu): New fuction, one USE_GTK version and
- 	one USE_X_TOOLKIT version.
+	one USE_X_TOOLKIT version.
 	(xmenu_show): Call create_and_show_popup_menu.
 	(dialog_selection_callback): New version for USE_GTK.
 	(create_and_show_dialog): New fuction, one USE_GTK version and
- 	one USE_X_TOOLKIT version.
+	one USE_X_TOOLKIT version.
 	(xdialog_show): Call create_and_show_dialog.
 
 	* xfns.c: Include gtkutil for USE_GTK.
@@ -513,9 +15059,9 @@
 	(redisplay_window): Add check for USE_GTK and FRAME_EXTERNAL_TOOL_BAR.
 	(display_menu_bar): Add check for USE_GTK
 
-	* lisp.h: Declare Vx_resource_name extern.
-
-	* keyboard.c (kbd_buffer_get_event):  Check MENU_BAR_ACTIVATE_EVENT
+	* lisp.h (Vx_resource_name): Declare extern.
+
+	* keyboard.c (kbd_buffer_get_event): Check MENU_BAR_ACTIVATE_EVENT
 	for USE_GTK.
 	(make_lispy_event): Check MENU_BAR_EVENT for USE_GTK.
 
@@ -525,8 +15071,8 @@
 
 	* fileio.c (Fread_file_name): Add check for USE_GTK.
 
-	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Add
-	check for USE_GTK.
+	* dispnew.c (adjust_frame_glyphs_for_window_redisplay):
+	Add check for USE_GTK.
 
 	* config.in: Added HAVE_GTK
 
@@ -592,15 +15138,15 @@
 	member private_vars.  All uses changed.
 
 	* process.c: Reworked 2003-01-12 change -- call a plist a plist!
-	(QCplist): Renamed from QCvars.  All uses changed.
+	(QCplist): Rename from QCvars.  Change all uses.
 	(Fprocess_plist): Replaces Fprocess_variable.  Simplified.
-	(Fset_process_plist): Replaces Fset_process_variable.  Simplified.
+	(Fset_process_plist): Replaces Fset_process_variable.  Simplify.
 	(syms_of_process): Intern, staticpro, defsubr these.
-	(Fmake_network_process): Describe :plist arg.  Removed :vars arg.
+	(Fmake_network_process): Describe :plist arg.  Remove :vars arg.
 
 2003-01-14  Francesco Potort,Al(B  <[e-mail]>
 
-	* m/delta.h: Removed (obsolete).
+	* m/delta.h: Remove (obsolete).
 
 2003-01-13  Francesco Potort,Al(B  <[e-mail]>
 
@@ -683,11 +15229,11 @@
 
 2003-01-08  Kim F. Storm  <[e-mail]>
 
-	* process.c (server_accept_connection): Fixed recording of new
+	* process.c (server_accept_connection): Fix recording of new
 	connection's local address in :local property of contact info.
 	(Fmake_network_process): Record local network address for new
 	client processes in :local property of contact info.
-	(format-network-address): Added arg OMIT-PORT.  Callers changed.
+	(format-network-address): Add arg OMIT-PORT.  Change callers.
 
 2003-01-07  Dave Love  <[e-mail]>
 
@@ -718,7 +15264,7 @@
 	selected frame.
 
 	* keymap.c (apropos_predicate, apropos_accumulate): Make them static.
-	(syms_of_keymap): staticpro them.
+	(syms_of_keymap): Staticpro them.
 	(Fapropos_internal): Initialize them and clear them out.
 	Don't GCPRO them.
 
@@ -730,7 +15276,7 @@
 	(XSAVE_VALUE): New macro.
 	(struct Lisp_Save_Value): New data type.
 	(union Lisp_Misc): Add u_save_value alternative.
-	(make_save_value): Declared.
+	(make_save_value): Declare.
 
 	* alloc.c (make_save_value): New function.
 
@@ -745,7 +15291,7 @@
 	in direct action cases for Qforward_char and Qbackward_char.
 	Set already_adjusted so it won't be done twice.
 
-2002-12-30  Richard Dawe  <[e-mail]>  (tiny change)
[phone]  Richard Dawe  <[e-mail]>
 
 	* src/config.in (!HAVE_SIZE_T): Fix order of arguments in
 	type definition of size_t.
@@ -766,7 +15312,7 @@
 
 2002-12-28  Steven Tamm  <[e-mail]>
 
-	* Makefile.in (macosx-bundle): Fixes to Mac OS X/Carbon port to
+	* Makefile.in (macosx-bundle): Fix Mac OS X/Carbon port to
 	allow building in a different directory than source.  Uses some
 	GNU Make extensions, but there is no other make on Mac OS X.
 
@@ -809,7 +15355,7 @@
 
 	* macterm.c (XTread_socket): Call KeyTranslate for control and
 	meta to deal correctly shifted non-alpha characters, like C-S-5
-	being treated like C-%.  Does not look for shift key to deal
+	being treated like C-%.  Do not look for shift key to deal
 	with masking off control-key with mac-reverse-ctrl-meta.
 
 2002-12-21  Richard M. Stallman  <[e-mail]>
@@ -843,7 +15389,7 @@
 	* dired.c (file_name_completion): Fix that change.
 	Delete special quit-handling code; just use QUIT.
 
-2002-12-21  Tak Ota  <[e-mail]>  (tiny change)
[phone]  Tak Ota  <[e-mail]>
 
 	* dired.c (file_name_completion): Close directory on error
 	just as in directory_files_internal.
@@ -862,9 +15408,9 @@
 	These changes were in part based upon suggestions made by Peter
 	'Luna' Runestig [[e-mail]].
 
-	* w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token,
-	g_b_init_get_token_information, g_b_init_lookup_account_sid,
-	g_b_init_get_sid_identifier_authority ): Added several static
+	* w32.c (g_b_init_is_windows_9x, g_b_init_open_process_token)
+	(g_b_init_get_token_information, g_b_init_lookup_account_sid)
+	(g_b_init_get_sid_identifier_authority ): Add several static
 	global variables.
 
 	* w32.c (globals_of_w32): New function.  Used to initialize those
@@ -896,18 +15442,18 @@
 	only if g_b_init_get_sid_identifier_authority is equal to 0.
 	On initialization set g_b_init_get_sid_identifier_authority equal to 1.
 
-	* w32fns.c (globals_of_w32fns): New function. Used to initialize
+	* w32fns.c (globals_of_w32fns): New function.  Used to initialize
 	those global variables that must always be initialized on startup
 	even when the global variable initialized is non zero.
 	Its primary purpose at this time is to initialize the global variable
 	track_mouse_event_fn.
 
-	* w32fns.c (w32_wnd_proc):  Remove initialization of
+	* w32fns.c (w32_wnd_proc): Remove initialization of
 	track_mouse_event_fn from the handler for the WM_SETFOCUS message.
 
 	* w32fns.c (syms_of_w32fns): Call globals_of_w32fns.
 
-	* w32menu.c (globals_of_w32menu):  New function. Used to
+	* w32menu.c (globals_of_w32menu): New function.  Used to
 	initialize those global variables that must always be initialized
 	on startup even when the global variable initialized is non zero.
 	Its primary purpose at this time is to initialize the global
@@ -983,9 +15529,9 @@
 
 2002-12-10  Steven Tamm  <[e-mail]>
 
-	* mac.c (sys_read): Fixed sys_read to not call select if IO is
+	* mac.c (sys_read): Fix sys_read to not call select if IO is
 	non-blocking.
-	(sys_select): Fixed sys_select to not use a timeout larger than
+	(sys_select): Fix sys_select to not use a timeout larger than
 	the one given.
 
 2002-12-10  Juanma Barranquero  <[e-mail]>
@@ -1021,7 +15567,7 @@
 
 	* macterm.c (mac_check_for_quit_char, quit_char_comp)
 	(init_quit_char_handler, mac_determine_quit_char_modifiers)
-	(mac_initialize): Added code to check for pressing of quit_char
+	(mac_initialize): Add code to check for pressing of quit_char
 	in the OS event queue.
 
 	* mac.c (sys_select): Call mac_check_for_quit_char every second
@@ -1265,7 +15811,7 @@
 	the version of advapi32.dll that is found in the 9x branch of
 	Microsoft Windows.
 
-	* w32.c (init_user_info): Replaced the calls to the win32 API
+	* w32.c (init_user_info): Replace the calls to the win32 API
 	functions OpenProcessToken, GetTokenInformation, LookupAccountSid,
 	and GetSidIdentifierAuthority with calls to the newly added
 	wrapper functions.
@@ -1274,11 +15820,11 @@
 	syms_of_w32term, syms_of_w32fns, syms_of_w32select,
 	syms_of_w32menu, and void syms_of_fontset.
 
-	* w32fns.c (w32_wnd_proc): Added code to reinitialize the
+	* w32fns.c (w32_wnd_proc): Add code to reinitialize the
 	function pointer track_mouse_event_fn in the handler for the
 	WM_SETFOCUS message.
 
-	* w32menu.c (initialize_frame_menubar): Added code to
+	* w32menu.c (initialize_frame_menubar): Add code to
 	reinitialize the function pointers set_menu_item_info and
 	get_menu_item_info.
 
@@ -1287,9 +15833,9 @@
 	* sound.c: Added a partial implementation of play-sound-internal
 	for Microsoft Windows.  Added various #ifdef / #else / #endif
 	code blocks to separate the code that will compile under
-	Microsoft Windows from the code that is specific to Gnu/Linux.
+	Microsoft Windows from the code that is specific to GNU/Linux.
 	Moved several blocks of code around to make this separation of code
-	into Windows compatible and Gnu/Linux compatible code blocks easier.
+	into Windows compatible and GNU/Linux compatible code blocks easier.
 
 	* makefile.w32-in: Include sound.c and link with WinMM.lib.
 
@@ -1409,7 +15955,7 @@
 
 2002-11-08  Pavel Jan,Am(Bk  <[e-mail]>
 
-	* process.c (Fformat_network_address): Removed unused locals p,
+	* process.c (Fformat_network_address): Remove unused locals p,
 	cp, and i.
 
 2002-11-06  Dave Love  <[e-mail]>
@@ -1592,7 +16138,7 @@
 	* process.c (Fformat_network_address): New function.
 	(syms_of_process): Defsubr it.
 	(list_processes_1): Use it to format :local/:remote address if
-	service/host is not set; before emacs would crash in that case.
+	service/host is not set; before Emacs would crash in that case.
 	(Fmake_network_process): Don't use Ffind_operation_coding_system
 	to setup coding system if host or service is not set.
 
@@ -2183,8 +16729,8 @@
 
 2002-08-26  Kim F. Storm  <[e-mail]>
 
-	* frame.c (make_terminal_frame) [CANNOT_DUMP]: Initialize foreground
-	and background colors.  From Joe Buehler (tiny change).
+	* frame.c (make_terminal_frame) [CANNOT_DUMP]: Initialize
+	foreground and background colors.  From Joe Buehler.
 
 2002-08-26  Miles Bader  <[e-mail]>
 
@@ -2255,7 +16801,7 @@
 
 	* msdos.c (croak): Add `void' to definition.
 
-	* sysdep.c [MSDOS] (request_sigio, unrequest_sigio):
+	* sysdep.c (request_sigio, unrequest_sigio) [MSDOS]:
 	Don't define them, they are defined in msdos.c.
 
 	* mem-limits.h [MSDOS]: Declare etext.
@@ -2265,7 +16811,7 @@
 
 2002-08-19  Kim F. Storm  <[e-mail]>
 
-	* keyboard.c (Fclear_this_command_keys): Added optional arg
+	* keyboard.c (Fclear_this_command_keys): Add optional arg
 	KEEP-RECORD to avoid clearing lossage when we just want to clear
 	the current key sequence (kmacro needs this).
 
@@ -2379,7 +16925,7 @@
 	* xdisp.c (forward_to_next_line_start): Return 0 when reaching the
 	end of the buffer.
 
-2002-08-08  Ken Raeburn  <[e-mail]>
[phone]  Ken Raeburn  <[e-mail]>
 
 	* coding.c (Ffind_operation_coding_system): Fix Lisp_Object/int mixup.
 
@@ -2657,12 +17203,11 @@
 
 2002-07-19  Juanma Barranquero  <[e-mail]>
 
-	* fileio.c (Ffile_name_as_directory): Fix argument name in docstring.
-	(file_name_as_directory): Use literal '/' instead of DIRECTORY_SEP.
-
 	* xdisp.c (syms_of_xdisp): Remove redundant deprecation info.
 
 	* fileio.c (syms_of_fileio): Likewise.
+	(Ffile_name_as_directory): Fix argument name in docstring.
+	(file_name_as_directory): Use literal '/' instead of DIRECTORY_SEP.
 
 2002-07-18  Richard M. Stallman  <[e-mail]>
 
@@ -2821,9 +17366,9 @@
 	* fns.c (concat): Likewise.
 	* lread.c (read_vector): Likewise.
 
-	* lisp.h (SMBP): Deleted.  All uses changed to STRING_MULTIBYTE.
+	* lisp.h (SMBP): Delete.  All uses changed to STRING_MULTIBYTE.
 	(STRING_SET_UNIBYTE): New macro.
-	(SET_STRING_BYTES): Deleted.  Callers (all of which supplied a
+	(SET_STRING_BYTES): Delete.  Callers (all of which supplied a
 	length of -1) changed to use STRING_SET_UNIBYTE.
 	* abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c,
 	casefiddle.c, category.c, ccl.c, charset.c, charset.h, coding.c,
@@ -2866,7 +17411,7 @@
 2002-07-11  Richard M. Stallman  <[e-mail]>
 
 	* alloc.c (Vmemory_full): New variable.
-	(Vmemory_signal_data): Renamed from memory_signal_data.
+	(Vmemory_signal_data): Rename from memory_signal_data.
 	Uses changed.
 	(syms_of_alloc): Defvar them.
 	(memory_full, buffer_memory_full): Set Vmemory_full.
@@ -2884,7 +17429,7 @@
 	(reseat_at_next_visible_line_start, next_element_from_buffer):
 	Use `double', not `float', when calling indented_beyond_p.
 
-	* s/hpux11.h (BROKEN_SA_RESTART): Defined.
+	* s/hpux11.h (BROKEN_SA_RESTART): Define.
 
 	* sysdep.c (sys_signal): Test BROKEN_SA_RESTART.
 
@@ -2899,8 +17444,8 @@
 
 2002-07-10  Juanma Barranquero  <[e-mail]>
 
-	* lisp.h (SPECPDL_INDEX): Rename from BINDING_STACK_SIZE. All callers
-	changed.
+	* lisp.h (SPECPDL_INDEX): Rename from BINDING_STACK_SIZE.
+	All callers changed.
 
 2002-07-09  Stefan Monnier  <[e-mail]>
 
@@ -3049,7 +17594,7 @@
 
 2002-06-27  Kim F. Storm  <[e-mail]>
 
-	* xdisp.c: (mode_line_string_list, mode_line_string_face)
+	* xdisp.c (mode_line_string_list, mode_line_string_face)
 	(mode_line_string_face_prop): New variables.
 	(store_mode_line_string): New function.
 	(display_mode_element): Use store_mode_line_string to
@@ -3092,7 +17637,7 @@
 
 2002-06-24  Juanma Barranquero  <[e-mail]>
 
-	* w32select.c: Include composite.h
+	* w32select.c: Include composite.h.
 
 	* w16select.c: Likewise.
 
@@ -3130,7 +17675,7 @@
 2002-06-21  Pavel Jan,Am(Bk  <[e-mail]>
 
 	* m/pmax.h (START_FILES): Define START_FILES for NetBSD and
-	OpenBSD. Add support for mipseb-*-netbsd* machines.
+	OpenBSD.  Add support for mipseb-*-netbsd* machines.
 
 2002-06-17  Andrew Choi  <[e-mail]>
 
@@ -3642,7 +18187,7 @@
 
 2002-05-11  Kim F. Storm  <[e-mail]>
 
-	* keymap.c (current_minor_maps): Fixed resizing of cmm_maps;
+	* keymap.c (current_minor_maps): Fix resizing of cmm_maps;
 	only update cmm_size if realloc actually succeeds.
 	Testing with initial size of 2 elements revealed that using
 	realloc on GNU/Linux would cause a random trap in xmalloc
@@ -3719,7 +18264,7 @@
 	* w32.c (sys_getpeername, fcntl): New functions.
 	(_sys_read_ahead): Temporarily block on non-blocking sockets.
 
-	* w32proc.c: include sys/file.h.
+	* w32proc.c: Include sys/file.h.
 
 2002-05-03  Colin Walters  <[e-mail]>
 
@@ -3801,7 +18346,7 @@
 	* fontset.c [MAC_OS]: Set Vdefault_fontset to ETL Fixed instead of
 	Apple Monaco.
 
-	* process.c: Declare QCfamily and QCfilter as extern.
+	* process.c (QCfamily, QCfilte): Declare extern.
 	(wait_reading_process_input) [MAC_OSX]: Clear bit for stdin before
 	calling select.
 
@@ -4083,7 +18628,7 @@
 
 	* config.in: Add HAVE_SHARED_GAME_DIR.
 
-	* callproc.c: (Vgame_score_directory): New variable.
+	* callproc.c (Vgame_score_directory): New variable.
 	(syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.
 
 2002-04-10  Richard M. Stallman  <[e-mail]>
@@ -4532,7 +19077,7 @@
 	(server_accept_connection): New function.
 	(wait_reading_process_input): Use it to handle incoming connects.
 	Do not enable input on a new connection if process is stopped.
-	(read_process_output): Handle datagram sockets. Use 2k buffer for them.
+	(read_process_output): Handle datagram sockets.  Use 2k buffer for them.
 	(send_process): Handle datagram sockets.
 	(Fstop_process, Fcontinue_process): Apply to network processes.  A stopped
 	network process is indicated by setting command field to t .
@@ -4629,9 +19174,9 @@
 
 2002-03-10  Jan Dj,Ad(Brv  <[e-mail]>
 
-	* xterm.h (x_session_check_input, x_session_initialize): Declared.
-
-	* xterm.c: (XTread_socket): Add call to x_session_check_input and
+	* xterm.h (x_session_check_input, x_session_initialize): Declare.
+
+	* xterm.c (XTread_socket): Add call to x_session_check_input and
 	x_session_have_connection.
 	(x_initialize): Add call to x_session_initialize.
 
@@ -4641,7 +19186,7 @@
 
 	* emacs.c (main): Add call to syms_of_xsmfns.
 
-	* lisp.h: Declare syms_of_xsmfns as extern.
+	* lisp.h (syms_of_xsmfns): Declare extern.
 
 	* config.in: Add HAVE_X_SM.
 
@@ -4881,7 +19426,7 @@
 
 2002-02-24  Kim F. Storm  <[e-mail]>
 
-	* keymap.c (Flookup_key): Fixed problem in 2001-12-28 patch:
+	* keymap.c (Flookup_key): Fix problem in 2001-12-28 patch:
 	The validation of the event type was too strict as it didn't
 	allow string events; buffer names are used in bindings for
 	menu-bar-select-buffer (see `menu-bar-update-buffers').
@@ -4894,7 +19439,7 @@
 	prefix in the keymaps, i.e. [remap COMMAND].
 
 	* keymap.c (Qremap, remap_command_vector): New variables.
-	(is_command_symbol): Removed function.
+	(is_command_symbol): Remove function.
 	(Fdefine_key): No longer accept a symbol for KEY.
 	Added validation of [remap COMMAND] argument for KEY.
 	The DEF is no longer required to be a symbol when remapping a command.
@@ -5048,10 +19593,10 @@
 
 2002-02-17  Kim F. Storm  <[e-mail]>
 
-	* frame.c: (Vmouse_highlight): New variable.
+	* frame.c (Vmouse_highlight): New variable.
 	(syms_of_frame): DEFVAR_LISP it.
 
-	* frame.h: (Vmouse_highlight): Declare extern.
+	* frame.h (Vmouse_highlight): Declare extern.
 
 	* xterm.h (struct x_display_info): Add mouse_face_hidden.
 
@@ -5108,7 +19653,7 @@
 
 2002-02-15  Andreas Schwab  <[e-mail]>
 
-	* puresize.h (BASE_PURESIZE): Increase to 9/5.
+	* puresize.h (PURESIZE_RATIO): Increase to 9/5.
 
 	* alloc.c (NSTATICS): Increase to 1280.
 
@@ -5252,7 +19797,7 @@
 	Doc updated.  Callers changed.  Pass arg to where_is_internal.
 
 	* keymap.h (Fkey_binding, Fwhere_is_internal): Update prototype.
-	(is_command_symbol): Added prototype.
+	(is_command_symbol): Add prototype.
 
 	* keyboard.c (Vthis_original_command): New variable.
 	(syms_of_keyboard): DEFVAR_LISP it.
@@ -5669,7 +20214,7 @@
 
 2002-01-03  Kim F. Storm  <[e-mail]>
 
-	* keyboard.c (read_key_sequence): Fixed cast of submaps arg to bcopy.
+	* keyboard.c (read_key_sequence): Fix cast of submaps arg to bcopy.
 
 2002-01-02  Richard M. Stallman  <[e-mail]>
 
@@ -5918,7 +20463,7 @@
 2001-12-14  Andrew Innes  <[e-mail]>
 
 	* makefile.w32-in (EMACSLOADPATH): Define.
-	($(EMACS)): Run `list-load-path-shadows' after dumping emacs.
+	($(EMACS)): Run `list-load-path-shadows' after dumping Emacs.
 	(bootstrap-temacs): Remove dependency on bootstrap-clean.
 
 2001-12-13  Eli Zaretskii  <[e-mail]>
@@ -5986,7 +20531,7 @@
 2001-12-09  Jason Rumney  <[e-mail]>
 
 	* w32menu.c (_widget_value): Make `help' field a Lisp_Object.
-	Add	comment to explain where the struct came from.
+	Add comment to explain where the struct came from.
 	(single_submenu, w32_menu_show): Set `help' field as Lisp_Object.
 	(add_menu_item): Process pop-up menus first to avoid memory leak.
 	(add_menu_item, w32_menu_display_help): Use `help' field as
@@ -6094,7 +20639,7 @@
 
 2001-12-03  Pavel Jan,Am(Bk  <[e-mail]>
 
-	* xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option.
+	* xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief' an option.
 
 2001-12-02  Pavel Jan,Am(Bk  <[e-mail]>
 
@@ -6118,7 +20663,7 @@
 
 2001-12-01  Jason Rumney  <[e-mail]>
 
-	* window.c (Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
+	* window.c (Qleft_fringe, Qright_fringe): Remove.  Now in frame.c.
 
 	* w32term.h (WM_MOUSELEAVE, TME_LEAVE, TRACKMOUSEEVENT)
 	[!WM_MOUSELEAVE]: Define.
@@ -6170,7 +20715,7 @@
 
 	* xterm.c (zv_height, zv_bits, zv_period): Changed zv bitmap to
 	fill fringe evenly with small dashes.
-	(x_draw_fringe_bitmap): Clear background if necessary. Align and
+	(x_draw_fringe_bitmap): Clear background if necessary.  Align and
 	clip the new ZV bitmap to avoid jitter between rows.
 	(x_draw_row_fringe_bitmaps): Rely on x_draw_fringe_bitmap to clear
 	background.  Don't draw fringe bitmaps if fringe width is zero.
@@ -6235,7 +20780,7 @@
 	menu items.  From David Ponce <[e-mail]>.
 	(w32_dialog_show) [HAVE_DIALOGS]: Compile whole function
 	conditionally.
-	(w32_menu_display_help): New argument OWNER. Rewritten to store a
+	(w32_menu_display_help): New argument OWNER.  Rewritten to store a
 	help event in the owner frame's keyboard buffer.
 
 	* w32fns.c (w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
@@ -6312,9 +20857,9 @@
 
 	* abbrev.c (Fexpand_abbrev): Use Frun_hooks instead of Vrun_hooks.
 
-	* buffer.c (Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
-
-	* print.c (temp_output_buffer_setup): Use Frun_hooks, not Vrun_hooks.
+	* buffer.c (Fkill_buffer): Likewise.
+
+	* print.c (temp_output_buffer_setup): Likewise.
 
 2001-11-25  Stefan Monnier  <[e-mail]>
 
@@ -6351,7 +20896,7 @@
 	(my_create_tip_window): Assign tip_window.
 	(x_create_tip_frame): Use same defaults as X.
 	(compute_tip_xy): Remove unused variable.  Use full screen width.
-	(Fx_show_tip): Do not double height. Call ShowWindow directly.
+	(Fx_show_tip): Do not double height.  Call ShowWindow directly.
 
 	* w32term.c (x_after_update_window_line): Doc fix.
 	(w32_read_socket): Doc fix.  Avoid SET_FRAME_GARBAGED for tip
@@ -6576,7 +21121,7 @@
 
 2001-11-16  Eli Zaretskii  <[e-mail]>
 
-	* syswait.h: (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
+	* syswait.h (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
 	Andrew Wiseman <[e-mail]>.
 
 2001-11-16  Kim F. Storm  <[e-mail]>
@@ -6588,9 +21133,9 @@
 	`bitmaps':
 
 	* dispextern.h (FRINGE_FACE_ID): Renamed from BITMAP_AREA_FACE_ID.
-	Comments fixed. Use renamed symbols.
-
-	* dispnew.c: Comment fix. Use renamed symbols.
+	Comments fixed.  Use renamed symbols.
+
+	* dispnew.c: Comment fix.  Use renamed symbols.
 
 	* frame.h (FRAME_FRINGE_COLS): Renamed from FRAME_FLAGS_AREA_COLS.
 	(FRAME_FRINGE_WIDTH): Renamed from FRAME_FLAGS_AREA_WIDTH.
@@ -6600,13 +21145,13 @@
 
 	* w32fns.c: Use renamed symbols.
 
-	* w32term.c: Comment fixes. Use renamed symbols.
+	* w32term.c: Comment fixes.  Use renamed symbols.
 	(fringe_bitmap_type): Renamed from bitmap_type.
 	(NO_FRINGE_BITMAP): Renamed from NO_BITMAP.
 	(w32_draw_fringe_bitmap): Renamed from w32_draw_bitmap.
 	(x_draw_row_fringe_bitmaps): Renamed from x_draw_row_bitmaps.
 
-	* w32term.h: Comment fixes. Use renamed symbols.
+	* w32term.h: Comment fixes.  Use renamed symbols.
 	(fringes_extra): Renamed from flags_areas_extra.
 	(FRAME_FRINGE_BITMAP_WIDTH): Renamed from FRAME_FLAGS_BITMAP_WIDTH.
 	(FRAME_FRINGE_BITMAP_HEIGHT): Renamed from FRAME_FLAGS_BITMAP_HEIGHT.
@@ -6619,22 +21164,22 @@
 
 	* widget.c: Use renamed symbols.
 
-	* window.c: Comment fixes. Use renamed symbols.
+	* window.c: Comment fixes.  Use renamed symbols.
 	(coordinates-in-window-p): Doc fix.
 
-	* xdisp.c: Comment fixes. Use renamed symbols.
+	* xdisp.c: Comment fixes.  Use renamed symbols.
 
 	* xfaces.c (realize_basic_faces): Use FRINGE_FACE_ID.
 
 	* xfns.c: Use renamed symbols.
 
-	* xterm.c: Comment fixes. Use renamed symbols.
+	* xterm.c: Comment fixes.  Use renamed symbols.
 	(fringe_bitmap_type): Renamed from bitmap_type.
 	(NO_FRINGE_BITMAP): Renamed from NO_BITMAP.
 	(x_draw_fringe_bitmap): Renamed from x_draw_bitmap.
 	(x_draw_row_fringe_bitmaps): Renamed from x_draw_row_bitmaps.
 
-	* xterm.h: Comment fixes. Use renamed symbols.
+	* xterm.h: Comment fixes.  Use renamed symbols.
 	(fringes_extra): Renamed from flags_areas_extra.
 	(FRAME_FRINGE_BITMAP_WIDTH): Renamed from FRAME_FLAGS_BITMAP_WIDTH.
 	(FRAME_FRINGE_BITMAP_HEIGHT): Renamed from FRAME_FLAGS_BITMAP_HEIGHT.
@@ -6752,8 +21297,8 @@
 2001-11-12  Jason Rumney  <[e-mail]>
 
 	* w32console.c, w32fns.c, w32menu.c, w32proc.c, w32select.c,
-	* w32term.c: Change doc-string comments to `new style'.
-	[w/`doc:' keyword]. Doc fixes.
+	* w32term.c: Change doc-string comments to `new style'
+	[w/`doc:' keyword].  Doc fixes.
 
 	* w32fns.c: Don't define max.
 	(Fx_open_connection): Only execute once.
@@ -6772,7 +21317,7 @@
 	* insdel.c (replace_range): Use adjust_markers_for_replace
 	instead of adjust_markers_for_delete and adjust_markers_for_insert.
 
-	* intervals.h: Declare set_text_properties and set_text_properties_1.
+	* intervals.h (set_text_properties, set_text_properties_1): Declare.
 
 	* textprop.c (set_text_properties_1): New subroutine
 	broken out of set_text_properties.
@@ -6788,7 +21333,7 @@
 2001-11-10  Jason Rumney  <[e-mail]>
 
 	* w32fns.c (enum_font_cb2): Use leading @ on face name to detect
-	vertical fonts. Allow them if face name is explicitly specified.
+	vertical fonts.  Allow them if face name is explicitly specified.
 	Do not give up if we find a font that cannot be converted to an xlfd.
 
 2001-11-10  Gerd Moellmann  <[e-mail]>
@@ -7215,7 +21760,7 @@
 
 2001-10-28  Pavel Jan,Am(Bk  <[e-mail]>
 
-	* emacs.c: Use argv[0] instead of emacs when -t was specified.
+	* emacs.c: Use argv[0] instead of "emacs" when -t was specified.
 
 	* keyboard.c: Change doc-string comments to `new style' [w/`doc:'
 	keyword].
@@ -7264,7 +21809,7 @@
 
 	* xterm.c: Fix typo in a comment.
 
-	* lisp.h: (gdb_lisp_params): Remove code in #if 0 which is now in
+	* lisp.h (gdb_lisp_params): Remove code in #if 0 which is now in
 	emacs.c.
 
 2001-10-27  Gerd Moellmann  <[e-mail]>
@@ -7388,7 +21933,7 @@
 
 2001-10-24  Pavel Jan,Am(Bk  <[e-mail]>
 
-	* xterm.c: (x_insert_glyphs): Remove unused variables `real_end'
+	* xterm.c (x_insert_glyphs): Remove unused variables `real_end'
 	and `real_start'.
 	(x_draw_image_foreground): Remove unused variables `mask' and `xgcv'.
 	(glyph_rect): Remove unused variable `area'.
@@ -7420,7 +21965,7 @@
 	(HAVE_BOXES): Fix typo in comment.
 	(push_menu_pane): Fix typo in comment.
 
-	* xdisp.c: (display_prop_string_p): Remove unused local declaration
+	* xdisp.c (display_prop_string_p): Remove unused local declaration
 	of `Qwhen'.
 	(single_display_prop_string_p): Remove unused local declarations
 	of `Qwhen' and `Qmargin'.
@@ -7598,7 +22143,7 @@
 	full-width rows.
 	(x_dump_glyph_string): Put in #if GLYPH_DEBUG.
 	(w32_draw_relief_rect): Extend left shadow to the bottom and left;
-	change bottom shadow accordingly. Some cleanup.
+	change bottom shadow accordingly.  Some cleanup.
 	(x_update_window_end): Handle overwritten mouse face
 	also for tool bar windows.
 	(show_mouse_face): Set the glyph row's mouse_face_p flag also when
@@ -7644,7 +22189,7 @@
 	(Fv_max_tooltip_size): New variable.
 	(syns_of_xfns): DEFVAR_LISP it.
 	(Fx_show_tip): Add parameter TEXT.  Set the tip frame's root
-	window buffer to *tip* right after creating the frame. Set frame's
+	window buffer to *tip* right after creating the frame.  Set frame's
 	window_width.  Use a maximum tooltip size specified by
 	Vx_max_tooltip_size, if that has valid contents.
 	(compute_tip_xy): Add parameters WIDTH and HEIGHT.
@@ -7687,3 +22232,5 @@
     Copyright (C) 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
+
+;;; arch-tag: 5dcc435f-4038-4141-b3bf-5be51cd76bd4