diff src/ChangeLog @ 49999:4a963c586625

A lot of lines removed at checkin version 1.3108, restore them

--- a/src/ChangeLog	Sat Mar 01 19:04:28 2003 +0000
+++ b/src/ChangeLog	Sun Mar 02 12:45:29 2003 +0000
@@ -611,7 +611,913 @@
 	* gtkutil.c (xg_create_frame_widgets): Check if there is an
 	external tool bar before setting tool bar height.
 
-2003-01-19  Ja
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xterm.c (handle_one_xevent): Surround popup_activated
+	with #ifdef:s for non-toolkit version.
+
+	* Makefile.in (XOBJ): Add gtkutil.o if USE_GTK
+	(gtkutil.o): New file.
+	(TOOLKIT_DEFINES): Set to -DUSE_GTK if HAVE_GTK.
+	(LIBW): Set to @GTK_LIBS@ if USE_GTK.
+
+	* gtkutil.c: New file for GTK version.
+
+	* gtkutil.h: New file for GTK version.
+
+	* xterm.h: Add xt_or_gtk_widget.
+	Include gtk files for USE_GTK.
+	(struct x_output): Add toolbar_height.
+	(struct x_output): Add GTK widgets and Gdk size_hints.
+	(GTK_WIDGET_TO_X_WIN, FRAME_GTK_OUTER_WIDGET, FRAME_GTK_WIDGET)
+	(FRAME_OUTER_WINDOW): New macros for USE_GTK.
+	(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.
+	(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.
+	(xg_scroll_callback): New function.
+	(x_create_toolkit_scroll_bar): Call xg_create_scroll_bar for USE_GTK.
+	(x_set_toolkit_scroll_bar_thumb): Call xg_set_toolkit_scroll_bar_thumb
+	for USE_GTK.
+	(x_scroll_bar_create): Call xg_update_scrollbar_pos and
+	xg_show_scroll_bar for USE_GTK.
+	(x_scroll_bar_remove): Call xg_remove_scroll_bar for USE_GTK.
+	(XTset_vertical_scroll_bar): Call xg_update_scrollbar_pos for USE_GTK.
+	(event_handler_gdk): New function for USE_GTK.
+	(handle_one_xevent): Call xg_resize_widgets for USE_GTK.
+	(handle_one_xevent): Make sure widget is mapped before
+	calling x_real_positions for USE_GTK.
+	(XTread_socket): Add GTK event loop for USE_GTK.
+	(x_set_window_size): Call xg_frame_set_char_size for USE_GTK.
+	(x_make_frame_visible): Call gtk_widget_show_all for USE_GTK.
+	(x_make_frame_invisible): Call gtk_widget_hide for USE_GTK.
+	(x_iconify_frame): Add code for USE_GTK.
+	(x_free_frame_resources): Call gtk_widget_destroy for USE_GTK.
+	(x_wm_set_size_hint): Only compile if not USE_GTK.  GTK version
+	is in gtkutil.c.
+	(x_term_init): Add initialization for GTK.
+	(syms_of_xterm): Set Vx_toolkit_scroll_bars for USE_GTK.
+
+	* 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.
+	(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.
+	(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.
+	(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.
+	(xdialog_show): Call create_and_show_dialog.
+
+	* xfns.c: Include gtkutil for USE_GTK.
+	(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 code for USE_GTK.
+	(x_set_background_color): Call xg_set_background_color for GTK.
+	(x_set_menu_bar_lines): Check for USE_GTK.
+	(x_set_tool_bar_lines): Call update_frame_tool_bar for USE_GTK.
+	(x_set_name, x_set_title): Call gtk_window_set_title for USE_GTK.
+	(x_window): Call xg_create_frame_widgets for USE_GTK.
+	(Fx_create_frame): Check for USE_GTK
+	(Fx_file_dialog): New implementation for USE_GTK.
+
+	* xdisp.c: Add check for USE_GTK for extern void set_frame_menubar.
+	(update_menu_bar): Add check for USE_GTK.
+	(update_tool_bar): Add check for USE_GTK and external tool bar.
+	(redisplay_tool_bar): Add check for USE_GTK and external tool bar.
+	(redisplay_internal): Add check for USE_GTK and popup_activated.
+	(redisplay_window): Add check for USE_GTK and FRAME_EXTERNAL_MENU_BAR.
+	(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
+	for USE_GTK.
+	(make_lispy_event): Check MENU_BAR_EVENT for USE_GTK.
+
+	* frame.h (struct frame): Add external_tool_bar.  Check for USE_GTK.
+	(FRAME_EXTERNAL_TOOL_BAR): New macro.
+	(FRAME_EXTERNAL_MENU_BAR): Check for USE_GTK.
+
+	* fileio.c (Fread_file_name): Add check for USE_GTK.
+
+	* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Add
+	check for USE_GTK.
+
+	* config.in: Added HAVE_GTK
+
+	* alloc.c (Fgarbage_collect): Call xg_mark_data for GTK.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* charset.h (Funibyte_char_to_multibyte): Export.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xmenu.c (mouse_position_for_popup): New function.
+	(Fx_popup_menu): Call mouse_position_for_popup for X and
+	mouse_position_hook for others.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* editfns.c (Finsert): Mention `string-make-multibyte' and
+	`string-as-multibyte' in doc string.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* fontset.c (syms_of_fontset): Setup Vfont_encoding_alist here.
+
+	* editfns.c (Fformat): Convert an unibyte char argument that is
+	formatted by "%c" to multibyte if the total result must be a
+	multibyte string.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (set-process-filter): Document unibyte/multibyte-ness
+	of string argument.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* charset.h (NEXT_CHAR_BOUNDARY, PREV_CHAR_BOUNDARY): New macros.
+
+	* regex.c (GET_CHAR_BEFORE_2): Use PREV_CHAR_BOUNDARY.
+	(re_search_2): Likewise.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (message_dolog): Fix bug of the case that *Message*
+	buffer is unibyte.
+
[phone]  Francesco Potort,Al(B  <[e-mail]>
+
+	* fns.c (Fsubstring): Clarify doc string.
+
+	* textprop.c (Ftext_properties_at, Fnext_char_property_change)
+	(Fprevious_char_property_change)
+	(Fnext_single_char_property_change)
+	(Fprevious_single_char_property_change, Fnext_property_change)
+	(Fnext_single_property_change, Fprevious_property_change)
+	(Fprevious_single_property_change, Fadd_text_properties)
+	(Fput_text_property, Fset_text_properties)
+	(Fremove_text_properties, Fremove_list_of_text_properties)
+	(Ftext_property_any, Ftext_property_not_all): Clarify doc strings.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.h (struct Lisp_Process): New member plist replaces old
+	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.
+	(Fprocess_plist): Replaces Fprocess_variable.  Simplified.
+	(Fset_process_plist): Replaces Fset_process_variable.  Simplified.
+	(syms_of_process): Intern, staticpro, defsubr these.
+	(Fmake_network_process): Describe :plist arg.  Removed :vars arg.
+
[phone]  Francesco Potort,Al(B  <[e-mail]>
+
+	* m/delta.h: Removed (obsolete).
+
[phone]  Francesco Potort,Al(B  <[e-mail]>
+
+	* fileio.c (Fdelete_directory, Fdelete_file): Document the
+	behaviour in front of symlinks.
+	(Fdelete_file): Raise an error on directories.
+
[phone]  Dave Love  <[e-mail]>
+
+	* fns.c (Freverse): Use QUIT.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (minibuffer_completion_contents):
+	Error if point is inside prompt.
+
+	* keyboard.c (command_loop_1): Don't redisplay directly
+	if there's a post-command-hook.
+
+	* fileio.c (syms_of_fileio) <directory-sep-char>: Doc fix.
+	(Fdo_auto_save): Add gcpros around Ffile_name_directory.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.h (struct Lisp_Process): New member private_vars.
+
+	* process.c (QCvars): New variable.
+	(syms_of_process): Intern and staticpro it.
+	(Fset_process_contact): Removed function.
+	(Fprocess_variable, Fset_process_variable): New functions.
+	(syms_of_process): Defsubr them.
+	(Fstart_process): Initialize private_vars plist to nil.
+	(Fmake_network_process): New arg :vars to setup the private
+	variables for new network process.
+	(server_accept_connection): Copy server's private variables to
+	client process.
+
+	* alloc.c (pure_alloc): Fixed 2003-01-10 changed (caused spurious
+	crashes).  Code rewritten and simplified.  Now directly aligns the
+	pointer and recalculates pure_bytes_used, rather than aligning the
+	size and adjusting the pointer.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fset_process_contact): New function.
+	(syms_of_process): defsubr it.
+	(make-network-process): Update doc.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* alloc.c (pure_alloc): Correct alignment for Lisp_Floats.
+	Reported by Berthold Gunreben <[e-mail]>.
+
[phone]  Dave Love  <[e-mail]>
+
+	* composite.c (syms_of_composite): Make composition_hash_table weak.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (Fmake_network_process): Convert new port number
+	to host byte order for `:service t' case.  From Mario Lang.
+
[phone]  Jan Dj,Ad(Brv  <[e-mail]>
+
+	* xfns.c (Fx_file_dialog): Call XtAppNextEvent and x_dispatch_event
+	instead of XtAppProcessEvent.
+
+	* xterm.c (handle_one_xevent): New function.
+	(x_dispatch_event): New function.
+	(XTread_socket): Call handle_one_xevent.
+
+	* xterm.h (FRAME_OUTER_TO_INNER_DIFF_X/Y): New.
+
+	* xmenu.c (Fx_popup_menu): If popping up at mouse position,
+	call XQueryPointer to get coordinates.
+	(popup_get_selection): Do not set popup_activated_flag to zero,
+	let popup_deactivate_callback do that.  Needed for Motif.
+	Call x_dispatch_event instead of XtDispatchEvent.
+	(xmenu_show): Calculate root coordinate from frame top/left position.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* process.c (server_accept_connection): Fixed 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.
+
[phone]  Dave Love  <[e-mail]>
+
+	* Makefile.in (fns.o): Depend on coding.h.
+
[phone]  Markus Rost  <[e-mail]>
+
+	* minibuf.c (Fread_variable): Doc fix.
+
+	* eval.c (Fuser_variable_p): Doc change.  For custom variables,
+	use the same test as for custom-variable-p.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (try_scrolling): New arg LAST_LINE_MISFIT.
+	Count LAST_LINE_MISFIT in scroll margin for end of window.
+	Move label too_near_end before setting SCROLL_MARGIN_POS.
+	Set LAST_LINE_MISFIT before jumping there.
+
+	* xdisp.c (try_scrolling): Calculate amount_to_scroll better in
+	scroll_conservatively case.  If scrolling that much doesn't change
+	STARTP, move it down one line.
+
+	* xdisp.c (redisplay_window): Pass last_line_misfit arg to
+	try_scrolling.  Make it 1 after make_cursor_line_fully_visible fails.
+
+	* xdisp.c (setup_echo_area_for_printing): Kill Emacs if no
+	selected frame.
+
+	* keymap.c (apropos_predicate, apropos_accumulate): Make them static.
+	(syms_of_keymap): staticpro them.
+	(Fapropos_internal): Initialize them and clear them out.
+	Don't GCPRO them.
+
+	* buffer.c (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>:
+	Doc fixes.
+
+	* lisp.h: New misc type Lisp_Save_Value.
+	(enum Lisp_Misc_Type): Add Lisp_Misc_Save_Value.
+	(XSAVE_VALUE): New macro.
+	(struct Lisp_Save_Value): New data type.
+	(union Lisp_Misc): Add u_save_value alternative.
+	(make_save_value): Declared.
+
+	* alloc.c (make_save_value): New function.
+
+	* xterm.c (x_catch_errors): Save dpy using make_save_value.
+	(x_catch_errors_unwind): Call XSync.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (window_scroll_pixel_based): Partially undo last change.
+
+	* keyboard.c (command_loop_1): Call adjust_point_for_property
+	in direct action cases for Qforward_char and Qbackward_char.
+	Set already_adjusted so it won't be done twice.
+
[phone]  Richard Dawe  <[e-mail]>  (tiny change)
+
+	* src/config.in (!HAVE_SIZE_T): Fix order of arguments in
+	type definition of size_t.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to
+	distinguish Carbon GUI builds from X11 builds on darwin.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (syms_of_macterm): Set mac-wheel-button-is-mouse-2
+	to default to t.
+
[phone]  Francesco Potort,Al(B  <[e-mail]>
+
+	* data.c (Fstring_to_number, Fminus): Better English in doc strings.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* Makefile.in (macosx-bundle): Fixes to 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.
+
[phone]  Francesco Potort,Al(B  <[e-mail]>
+
+	* data.c (Fmakunbound, Ffmakunbound, Fmake_variable_buffer_local)
+	(Fsetq_default, Fmake_local_variable, Fkill_local_variable)
+	(Fmake_variable_frame_local, Faset, Fnumber_to_string, Fminus)
+	(Fstring_to_number): Mention the returned value in the doc strings.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <scroll-up-aggressively>
+	<scroll-down-aggressively>: Doc fix.
+
+	* xmenu.c (parse_single_submenu): Use individual keymap's prompt
+	string as pane name, if there is one.
+	(set_frame_menubar): Save menu_items_n_panes from each call to
+	parse_single_submenu and use it when calling digest_single_submenu.
+
+	* window.c (window_scroll_pixel_based): Fix check for reaching BEGV.
+	Don't try to make last line fully visible if it is past end of window.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macmenu.c (MIN_POPUP_SUBMENU_ID): Add.
+	(mac_menu_show): Add support for hierarchical popup menus.
+	(add_menu_item): Remove indentation support.
+	(fill_submenu, fill_menu): Create hierarchical menus
+	instead of using indentation.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (try_cursor_movement): Don't call try_window here.
+	(redisplay_window): Never redisplay minibuffer when inactive.
+
+	* window.c (select_window_1): Undo 9/21 change.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* 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
+	with masking off control-key with mac-reverse-ctrl-meta.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (popup_get_selection): Now static.  New arg DO_TIMERS.
+	If it is non-nil, run timers.  Use an unwind-protect to requeue
+	the events that were read ahead.
+	(popup_get_selection_unwind): New subroutine.
+	(popup_get_selection_queue): File-scope variable now holds that queue.
+	(xmenu_show): Pass 0 for DO_TIMERS to popup_get_selection.
+	(xdialog_show): Pass 1 for DO_TIMERS to popup_get_selection.
+	Use an unwind-protect to pop down the dialog box.
+	(xdialog_show_unwind): New subroutine implements that.
+
+	* xdisp.c (row_containing_pos): Change exit test using last_y.
+	(try_window_id): Abort if row_containing_pos returns null.
+
+	* lread.c (load_error_handler): New function.
+	(Fload): Handle errors in Fsubstitute_in_file_name.
+	Don't expect Fsignal to return.
+
+	* eval.c: Errors and throws work right with interrupt blocking.
+	(struct catchtag): New elt interrupt_input_blocked.
+	(unwind_to_catch): Restore interrupt_input_blocked from saved value.
+	(internal_catch, Fcondition_case, internal_condition_case)
+	(internal_condition_case_1, internal_condition_case_2): Save it.
+	(Fsignal): Don't do TOTALLY_UNBLOCK_INPUT.
+
+	* editfns.c (Fformat): Add parens.
+
+	* dired.c (file_name_completion): Fix that change.
+	Delete special quit-handling code; just use QUIT.
+
[phone]  Tak Ota  <[e-mail]>  (tiny change)
+
+	* dired.c (file_name_completion): Close directory on error
+	just as in directory_files_internal.
+
[phone]  David Kastrup  <[e-mail]>
+
+	* window.c (Fset_window_configuration): Set old_point to correct
+	value when new_current_buffer == current_buffer.
+
[phone]  Ben Key  <[e-mail]>
+
+	Revisited my earlier fix for the following entry in etc/PROBLEMS:
+	"Emacs built on Windows 9x/ME crashes at startup on Windows XP,
+	or Emacs builtpart of on XP crashes at startup on Windows 9x/ME."
+
+	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
+	global variables.
+
+	* w32.c (globals_of_w32): 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 set the global variables
+	g_b_init_is_windows_9x, g_b_init_open_process_token,
+	g_b_init_get_token_information, g_b_init_lookup_account_sid, and
+	g_b_init_get_sid_identifier_authority to 0 on startup.
+	Called from main.
+
+	* w32.c (is_windows_9x): Perform initialization only if
+	g_b_init_is_windows_9x is equal to 0.  On initialization set
+	g_b_init_is_windows_9x equal to 1.
+
+	* w32.c (open_process_token): Perform initialization only if
+	g_b_init_open_process_token is equal to 0.  On initialization set
+	g_b_init_open_process_token equal to 1.
+
+	* w32.c (get_token_information): Perform initialization only if
+	g_b_init_get_token_information is equal to 0.  On initialization
+	set g_b_init_get_token_information equal to 1.
+
+	* w32.c (lookup_account_sid): Perform initialization only if
+	g_b_init_lookup_account_sid is equal to 0.  On initialization
+	set g_b_init_lookup_account_sid equal to 1.
+
+	* w32.c (get_sid_identifier_authority): Perform initialization
+	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
+	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
+	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
+	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
+	variables get_menu_item_info and set_menu_item_info.
+
+	* w32menu.c (initialize_frame_menubar): Remove initialization of
+	get_menu_item_info and set_menu_item_info.
+
+	* w32menu.c (syms_of_w32menu): Call globals_of_w32menu.
+
+	* w32.h (globals_of_w32, globals_of_w32fns, globals_of_w32menu):
+	Declare them.
+
+	* emacs.c (main): Call globals_of_w32 prior to calling
+	init_environment if WINDOWSNT is defined.  Call globals_of_w32fns
+	and globals_of_w32menu if initialized is non zero and HAVE_NTGUI
+	is defined.
+
+	* w32term.c (x_update_window_begin): Fix Windows API error
+	detected by BoundsChecker.  Test to determine if
+	w32_system_caret_hwnd is NULL prior to attempting to use
+	SendMessage to send the WM_EMACS_HIDE_CARET message to it.
+
+	* w32term.c (x_update_window_end): Fix Windows API error
+	detected by BoundsChecker.  Test to determine if
+	w32_system_caret_hwnd is NULL prior to attempting to use
+	SendMessage to send the WM_EMACS_SHOW_CARET message to it.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (coding_system_require_warning): New variable.
+	(syms_of_coding): DEFVAR it.
+
+	* coding.h (coding_system_require_warning): Extern it.
+
+	* fileio.c (choose_write_coding_system): Even if
+	Vcoding_system_for_write is non-nil, if
+	coding_system_require_warning is nonzero, call
+	Vselect_safe_coding_system_function.
+
[phone]  Markus Rost  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): Add cus-face and timer.
+	(lisp): Add font-core.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* textprop.c (text_read_only): New arg `propval'.
+	(get_char_property_and_overlay): Remove unused var `next_overlay'.
+	(verify_interval_modification): Use text_read_only's new arg.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Funencodable_char_position): Set pend correctly.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (last_mousemove_x, last_mousemove_y): New variables.
+	(w32_read_socket) <WM_MOUSEMOVE>: Use them to detect non-movement.
+	Be more careful about when help_events are generated.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* macterm.c (mac_check_for_quit_char): Correctly set the
+	modifiers of the event to 0.
+	* mac.c (sys_select): Duplicate rfds before calling select to
+	ensure that rfds survive the while loop.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (try_window_id): Don't call set_cursor_from_row if
+	row_containing_pos returned NULL.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* mac.c (sys_read): Fixed sys_read to not call select if IO is
+	non-blocking.
+	(sys_select): Fixed sys_select to not use a timeout larger than
+	the one given.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* editfns.c (Fformat): Use alloca, not _alloca.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fget_buffer_create): Call Qucs_set_table_for_input
+	as the last thing.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/sol2-8.h: Removed.  (Not necessary.)
+
[phone]  Matthew Swift  <[e-mail]>
+
+	* editfns.c (Fformat): Handle precision in string conversion
+	specifiers like libc functions do (ie, print at most that many
+	characters).
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (row_containing_pos): Check more carefully
+	whether charpos is really in the row before returning it.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* sysdep.c (emacs_read) [HAVE_CARBON]: Have emacs_read use sys_read.
+
+	* eval.c (Feval) [HAVE_CARBON]: Calls mac_check_for_quit_char at
+	each stack frame.  This may change as it could be time consuming.
+
+	* 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
+	in the OS event queue.
+
+	* mac.c (sys_select): Call mac_check_for_quit_char every second
+	while blocking on select.
+
+	* mac.c (sys_read): Use sys_select to test for input first
+	before calling read, to allow C-g to break.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (Fcompleting_read): Doc fix.
+
+	* lread.c (syms_of_lread) <load-history>: Doc fix.
+
+	* fileio.c (Fcopy_file): Set immediate_quit around emacs_open call.
+
+	* eval.c (Fdefun, Fdefmacro): Record in load-history redefining an
+	autoload.
+
+	* data.c (Fdefalias): Record in load-history redefining an autoload.
+
+	* alloca.c: Undo ifdef change accidentally made on 12-04.
+
[phone]  Francesco Potorti`  <[e-mail]>
+
+	* xfns.c (png_load): Avoid double gamma correction for PNG images.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* sysdep.c (fcntl.h): Test only HAVE_FCNTL_H.
+
+	* fileio.c (fcntl.h): Test only HAVE_FCNTL_H.
+
+	* alloca.c: Don't use #error.
+
[phone]  Dave Love  <[e-mail]>
+
+	* buffer.c (Qucs_set_table_for_input): New.
+	(Fget_buffer_create): Use it.
+	(Qset_buffer_major_mode_hook): Deleted.
+	(Fset_buffer_major_mode): Revert previous change.
+	(init_buffer_once): Intern ucs-set-table-for-input.
+	(syms_of_buffer): Delete Qset_buffer_major_mode_hook.
+	Add &Qucs_set_table_for_input.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Use next_event only if less
+	than key_count.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macmenu.c (add_menu_item, fill_menubar): Truncate menu item
+	names to 255 characters.
+
+	* macterm.c (XTread_socket): If all frames have been collapsed,
+	expand the first one before handling drag-and-drop events.
+
+	* s/darwin.h (GETPGRP_NO_ARG): Delete.  Replaced by GETPGRP_VOID,
+	which is detected by autoconf.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* unexmacosx.c (copy_twolevelhints, dump_it): Now corrects the
+	offset in two hints table to allow prebinding to be redone and
+	allow the executable to be stripped.
+
[phone]  Dave Love  <[e-mail]>
+
+	* fns.c (Frequire): Don't call LOADHIST_ATTACH if feature was
+	already provided.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (start_display): Check more intelligently for
+	whether the line is continued.
+	(move_it_vertically_backward): Clear it->continuation_lines_width.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/amdahl.h, s/unipl5-0.h, m/sgi3000.h, s/3700.h, s/alliant-2800.h:
+	* s/alliant.h, s/altos.h: Deleted.  (Unused/empty.)
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* fns.c (Frequire): Change nesting allowance from 2 to 3 to cause
+	more descriptive error output from lread.c:Fload upon most require
+	cycles during boostrapping.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents): Give a more appropriate error
+	for files bigger than 2Gb when off_t is 32 bit.
+
+	* dired.c (Ffile_attributes): Don't return negative file sizes for
+	files bigger than 2Gb when off_t is 32 bit.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/irix6-0.h (GC_SETJMP_WORKS, GC_MARK_STACK): Define.
+
+	* systty.h: Don't conditionally define GETPGRP_NO_ARG.
+	Test GETPGRP_VOID instead.
+	[BSD_TERMIOS]: Remove definitions (never used).
+
+	* s/osf5-0.h (WAIT_USE_INT, SYS_SIGLIST_DECLARED, sys_siglist):
+	Don't define.
+	(GC_SETJMP_WORKS, GC_MARK_STACK): Define.
+
+	* m/mips.h (WORDS_BIG_ENDIAN): Define conditionally.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32.c (sys_write): Avoid non-blocking mode, which is not fully
+	supported.
+
[phone]  Dave Love  <[e-mail]>
+
+	* unexalpha.c (update_dynamic_symbols): Cast arg of fatal_unexec.
+
+	* Makefile.in (TEMACS_LDFLAGS): Update last change.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* m/ia64.h: Restore `#ifndef NOT_C_CODE' deleted by last change.
+
[phone]  Steven Tamm  <[e-mail]>
+
+	* unexmacosx.c (unexec_realloc): Use malloc_default_zone to
+	determine the size of pointers alloced in unexed space instead
+	of using possibly invalid emacs_zone pointers.  This fixes the
+	binary incompatibility problems caused by updates to libSystem.B.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (Fstring_match): Doc fix.
+
+	* callint.c (Fcall_interactively): If a command fails because
+	`*' detects a read-only buffer, but RECORD_FLAG is set,
+	record it anyway if the args don't actually do tty input.
+
[phone]  Dave Love  <[e-mail]>
+
+	* sysdep.c (stuff_char) [PROTOTYPES]: Provide ISO C arglist.
+
+	* keyboard.c (interrupt_signal): Provide forward declaration.
+	(kbd_buffer_store_event): Don't declare interrupt_signal.
+
+	* xdisp.c (store_frame_title_char) [PROTOTYPES]: Provide ISO C arglist.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (interactive_p): Skip any number of bytecode
+	and special form frames, in any order.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (convert_mono_to_color_image): New function.
+	(xbm_load, xbm_load_image): Use it when foreground or background
+	is explicitly set.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/usg5-4.h, sco4.h (bcopy, bzero, bcmp): Don't define.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (x_build_heuristic_mask): Filter palette info from color.
+	(XPutPixel): Swap blue and red.
+	(xpm_format, pbm_format, png_format, jpeg_format, tiff_format)
+	(gif_format, gs_format): Use IMAGE_ASCENT_VALUE.
+	(xpm_image_p, pbm_image_p, png_image_p, jpeg_image_p)
+	(tiff_image_p, gif_image_p, gs_image_p): Don't check ascent.
+
[phone]  Dave Love  <[e-mail]>
+
+	* m/orion105.h (HAVE_ALLOCA): Don't define.
+
+	* m/m68k.h, m/arm.h, mtekxd88.h, m/tower32v3.h: Don't define alloca.
+
+	* m/intel386.h: Don't include alloca.h or define alloca.
+
+	* m/ia64.h: Don't include alloca.h, stdlib.h.  Don't declare
+	malloc, realloc, calloc.
+
+	* m/hp800.h, m/sr2k.h, m/ns16000.h, m/wicat.h (bcopy, bzero)
+	(bcmp): Don't define.
+
+	* m/delta.h (bcopy, bzero, bcmp, alloca): Don't define.
+
+	* m/amdahl.h: Don't define LIB_STANDARD.
+
+	* m/alpha.h: Move OSF1 stuff from here to s/osf1.h.
+
+	* s/osf1.h: Move OSF1 stuff from m/alpha.h to here.
+
+	* s/irix4-0.h, s/irix5-0.h, m/powerpcle.h, m/sparc.h:
+	Don't include alloca.h.
+
+	* s/aix3-2.h (HAVE_FSYNC): Don't define.
+
+	* regex.c (_GNU_SOURCE): Don't define.
+
+	* process.c (_GNU_SOURCE): Don't define.
+
+	* fileio.c (_GNU_SOURCE, HAVE_FSYNC): Don't define.
+
[phone]  Markus Rost  <[e-mail]>
+
+	* s/sol2-8.h: Include sol2-6.h.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* dispextern.h (struct face): Add `overstrike' field.
+	* xterm.c (x_draw_glyph_string_foreground)
+	(x_draw_composite_glyph_string_foreground): Implement overstriking.
+	* xfaces.c (load_face_font): Set `face->overstrike' based on
+	result from choose_face_font.
+	(best_matching_font, choose_face_font): Add `needs_overstrike'
+	argument, and use it to return whether overstriking is desirable
+	for this face/font combo.
+	(set_font_frame_param: Pass new argument to choose_face_font.
+
[phone]  Ben Key  <[e-mail]>
+
+	This change is my fix for the following entry in etc/PROBLEMS:
+	"Emacs built on Windows 9x/ME crashes at startup on Windows XP,
+	or Emacs builtpart of on XP crashes at startup on Windows 9x/ME."
+
+	* w32.c: Added wrapper functions around the win32 API functions
+	OpenProcessToken, GetTokenInformation, LookupAccountSid, and
+	GetSidIdentifierAuthority.  These wrapper functions serve two
+	purposes:
+	1.  They ensure that the wrapped function can never be called
+	when Emacs is running on an operating system on which they are
+	not supported (Microsoft Windows 95 / 98 / ME).
+	2.  They call the wrapped functions via function pointers rather
+	than calling them directly.  This avoids taking advantage of the
+	undocumented fact that although these functions are not supported
+	in the 9x branch of Microsoft Windows, the functions do exist in
+	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
+	functions OpenProcessToken, GetTokenInformation, LookupAccountSid,
+	and GetSidIdentifierAuthority with calls to the newly added
+	wrapper functions.
+
+	* w32.h: Added extern declarations for the following functions:
+	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
+	function pointer track_mouse_event_fn in the handler for the
+	WM_SETFOCUS message.
+
+	* w32menu.c (initialize_frame_menubar): Added code to
+	reinitialize the function pointers set_menu_item_info and
+	get_menu_item_info.
+
[phone]  Ben Key  <[e-mail]>
+
+	* 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.
+	Moved several blocks of code around to make this separation of code
+	into Windows compatible and Gnu/Linux compatible code blocks easier.
+
+	* makefile.w32-in: Include sound.c and link with WinMM.lib.
+
+	* s/ms-w32.h: Defined the symbol HAVE_SOUND so that the newly
+	added support for play-sound-internal under Windows would be
+	included in the build of Emacs.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (w32_load_system_font): Don't disable Cleartype.
+
+	* w32term.c (w32_get_glyph_string_clip_rect): Clip cursor tightly.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (command_loop_1): Fix int/Lisp_Object mixup.
+	(adjust_point_for_property): Move out of display and invisible even if
+	we were already inside before (in case a property was added while
+	we weren't looking).  Be more careful when handling invisible props.
+	Skip invisible text as if it really wasn't there at all.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (x_draw_image_foreground)
+	(w32_draw_image_foreground_1): Use standard copy and invert
+	operations to draw images.
+
+	* w32fns.c (x_create_x_image_and_pixmap): Fill in palette for
+	depth of 1.
+	(xbm_read_bitmap_data): Invert bits as xbm is read in.
+	(XPutPixel): Don't invert bits here.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (x_draw_image_foreground, x_draw_image_glyph_string)
+	(w32_draw_image_foreground_1): Handle image masks.
+	(x_draw_image_glyph_string): Don't BitBlt transparently.
 
 	* w32fns.c (w32_defined_color): Adjust RGB values for Emacs.
 	(x_from_xcolors): Adjust RGB values for W32.
@@ -689,11 +1595,12 @@
 
 2002-11-08  Juanma Barranquero  <[e-mail]>
 
-	* w32term.c (w32_draw_fringe_bitmap): Remove unused variable window.
+	* w32term.c (w32_draw_fringe_bitmap): Remove unused local variable
+	window.
 
 2002-11-08  Pavel Jan,Am(Bk  <[e-mail]>
 
-	* process.c (Fformat_network_address): Remove unused locals p,
+	* process.c (Fformat_network_address): Removed unused locals p,
 	cp, and i.
 
 2002-11-06  Dave Love  <[e-mail]>
@@ -1135,6 +2042,471 @@
 	(do_auto_save_make_dir, do_auto_save_eh): New functions.
 	(do_auto_save_unwind): Don't call pop_message.
 
+	* lisp.h (pop_message_unwind): Renamed from push_message_unwind.
+
+	* keyboard.c (Fexecute_extended_command): Use pop_message_unwind.
+
+	* alloc.c (Fgarbage_collect): Use pop_message_unwind.
+
+	* xdisp.c (pop_message_unwind): Renamed from push_message_unwind.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* regex.c (DISCARD_FAILURE_REG_OR_COUNT): Delete.
+	(CHECK_INFINITE_LOOP): Don't pop anything: just set `cycle' to 1.
+	(re_match_2_internal): Be more careful with infinite loops.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macros.c (end_kbd_macro): New function.
+	(Fend_kbd_macro): Use it.
+
+	* macros.h (end_kbd_macro): Declare extern.
+
+	* keyboard.c (Fdiscard_input): If defining keyboard macro,
+	end and save it instead of discarding it.
+
[phone]  Markus Rost  <[e-mail]>
+
+	* s/sol2-6.h: Fix typo.  Add comment.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.c (regnum_t): Use signed int, not unsigned int.
+
+	* s/sol2-6.h: New file.
+
+	* s/sol2-5.h (UNEXEC): Definition deleted.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macros.c (executing_macro_index): Change type to EMACS_INT.
+	(syms_of_macros): DEFVAR_INT it  (needed by kmacro).
+
+	* macros.h (executing_macro_index): Change type to EMACS_INT.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* casetab.c (set_case_table): Make canon table point to eqv table.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* coding.c (syms_of_coding): Fix spacing.
+
+	* composite.c (Fcompose_region_internal)
+	(Fcompose_string_internal): Likewise.
+
+	* data.c (Flsh): Likewise.
+
+	* fontset.c (Fset_fontset_font): Likewise.
+
+	* macfns.c (Fx_server_max_request_size): Likewise.
+
+	* w16select.c (syms_of_win16select): Likewise.
+
+	* w32select.c (syms_of_w32select): Likewise.
+
+	* xselect.c (syms_of_xselect): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* regex.c (set_image_of_range_1): In no-TRANSLATE case,
+	call EXTEND_RANGE_TABLE and return a proper value.
+	(set_image_of_range): Don't call set_image_of_range_1
+	if no TRANSLATE or if range includes all of Latin-1.
+	Only call it for the Latin-1 part of the range.
+	For other cases, make two separate ranges,
+	one for the original specified characters and one for
+	their case-conversions.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/sol2-5.h (UNEXEC): Use unexsol.o.
+
+	* window.c (displayed_window_lines): Correct for one-off bug
+	in HEIGHT on non-window displays.
+
+	* regex.c (set_image_of_range_1): New function.
+	(set_image_of_range): Use set_image_of_range_1 for Latin-1.
+	Return a value to indicate running out of memory.
+	(SET_RANGE_TABLE_WORK_AREA): Check value from set_image_of_range.
+	(extend_range_table_work_area): New subroutine.
+	(EXTEND_RANGE_TABLE): Replaces EXTEND_RANGE_TABLE_WORK_AREA.
+	Different calling conventions, and used from set_image_of_range{,_1}.
+	(IMMEDIATE_QUIT_CHECK): Definitions moved.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* makefile.w32-in: All dependencies updated.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* unexsol.c: New file.
+
+	* xfns.c (Qbox): Declare external, don't define.
+
+	* xdisp.c (redisplay_window) <force-start case>:
+	If point is on semi-visible last line, reposition
+	it at previous line.
+
+	* alloc.c (display_malloc_warning): Use display-warning.
+	(malloc_warning_1): Function deleted.
+
+	* alloc.c [ALLOC_DEBUG]: #undef INLINE.
+
+	* lread.c (read1): Handle #! by skipping the line.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* Makefile.in (TEMACS_LDFLAGS): Renamed from ALL_LDFLAGS.
+	Don't include LDFLAGS.
+	(temacs): Pass LDFLAGS separately, and not via YMF_PASS_LDFLAGS.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xdisp.c (get_window_cursor_type): Don't use x_highlight_frame
+	member of x_display_info unless we compile for some window system.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (Valternate_cursor_type, Qalternate_cursor_type): Removed.
+	(get_window_cursor_type): Don't use them.
+	(syms_of_xdisp): Remove intern, staticpro, and defvar for them.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): Fix previous change.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (expose_overlaps): New function (merge code from xterm.c).
+	(expose_window): Use it to fix the display of overlapping
+	rows (merge code from xterm.c).
+
+	* macfns.c (Qbox): Add extern declaration.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* w32fns.c (Qbox): Make extern.
+	(syms_of_w32fns): Remove initialization of Qbox.
+
[phone]  Rune Kleveland  <[e-mail]>  (tiny change)
+
+	* xfns.c (Fx_open_connection): Fix error message.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes consolidates the handling of the cursor
+	type in xdisp.c, moving duplicate code and functionality from
+	xfns.c, xterm.c, w32fns.c, w32term.c, macfns.c, and macterm.c.
+
+	* frame.h (enum text_cursor_kinds): Consolidated here.
+	Added DEFAULT_CURSOR value.
+	(struct frame) <desired_cursor, cursor_width>
+	<blink_off_cursor, blink_off_cursor_width>: New fields.
+	Consolidated from output_x, output_w32 and output_mac structs.
+	(FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
+	(FRAME_BLINK_OFF_CURSOR_WIDTH): Macros consolidated here.
+
+	* xdisp.c (Qbar, Qhbar, Qbox, Qhollow, Vblink_cursor_alist):
+	Variables consolidated here.
+	(Valternate_cursor_type, Qalternate_cursor_type): New variables.
+	(Vcursor_in_non_selected_windows): Renamed from
+	cursor_in_non_selected_windows and changed to Lisp_Object.
+	(syms_of_xdisp): Define and staticpro new and moved variables.
+	(get_specified_cursor_type): Renamed from x_specified_cursor_type;
+	consolidated here.  Recognize Qhollow setting.
+	(set_frame_cursor_types): New function to set frame cursor types
+	based on the frame parameters.
+	(get_window_cursor_type): New function to calculate new cursor
+	type and width for the specified window.  Based on duplicated
+	code consolidated here.
+	Enhancements: cursor-in-non-selected-windows may be a cursor type,
+	check buffer-local alternate-cursor-type and blink-cursor-alist
+	before using built-in blink off methods.
+
+	* dispextern.h (cursor_in_non_selected_windows): Extern removed.
+
+	* lisp.h (Qcursor_in_non_selected_windows): Extern removed.
+	(get_specified_cursor_type, get_window_cursor_type)
+	(set_frame_cursor_types): Added prototypes.
+
+	* macfns.c (x_specified_cursor_type): Removed.
+	(x_set_cursor_type): Use set_frame_cursor_types.
+	(Qbar, Qbox): Removed.
+	(syms_of_macfns): Don't intern or staticpro them.
+
+	* macterm.c (x_specified_cursor_type): Remove prototype.
+	(x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH.
+	(x_display_and_set_cursor): Use get_window_cursor_type.
+	Remove unused local variables cursor_non_selected, active_cursor.
+	Redraw cursor if hbar cursor width changes.
+	(make_mac_frame): Set FRAME_DESIRED_CURSOR.
+
+	* macterm.h (enum text_cursor_kinds): Removed.
+	(struct output_mac) <current_cursor, desired_cursor, cursor_width>
+	<blink_off_cursor, blink_off_cursor_width>: Members removed.
+	(FRAME_DESIRED_CURSOR): Macro removed.
+
+	* w32fns.c (Vblink_cursor_alist): Removed.
+	(Qbar, Qhbar, Qbox, Qhollow): Removed.
+	(syms_of_w32fns): Don't intern, staticpro, or define them.
+	(x_specified_cursor_type): Removed.
+	(x_set_cursor_type): Use set_frame_cursor_types.
+
+	* w32term.c (x_specified_cursor_type): Remove prototype.
+	(x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH.
+	(x_display_and_set_cursor): Use get_window_cursor_type.
+	Remove unused local variables cursor_off_state.
+	Redraw cursor if hbar cursor width changes.
+	Changed all occurrences of w32_highlight_frame to x_highlight_frame.
+
+	* w32term.h (enum text_cursor_kinds): Removed.
+	(struct output_w32) <current_cursor, desired_cursor, cursor_width>
+	<blink_off_cursor, blink_off_cursor_width>: Members removed.
+	(FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
+	(FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed.
+	(struct w32_display_info) <x_highlight_frame>: Renamed member from
+	w32_highlight_frame.
+
+	* xfns.c (Vblink_cursor_alist): Removed.
+	(Qbar, Qhbar, Qbox, Qhollow): Removed.
+	(syms_of_xfns): Don't intern, staticpro, or define them.
+	(x_specified_cursor_type): Removed.
+	(x_set_cursor_type): Use set_frame_cursor_types.
+
+	* xterm.c (x_specified_cursor_type): Remove prototype.
+	(x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH.
+	(x_display_and_set_cursor): Use get_window_cursor_type.
+	Remove unused local variables cursor_off_state.
+	Redraw cursor if hbar cursor width changes.
+
+	* xterm.h (enum text_cursor_kinds): Removed.
+	(struct output_x) <current_cursor, desired_cursor, cursor_width>
+	<blink_off_cursor, blink_off_cursor_width>: Members removed.
+	(FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
+	(FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed.
+	(x_specified_cursor_type): Remove prototype.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* w32fns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and
+	FRAME_BLINK_OFF_CURSOR_WIDTH using defaults and Vblink_cursor_alist.
+	(Vblink_cursor_alist): New variable.
+	(syms_of_w32fns): Initialize and defvar it.
+	(x_specified_cursor_type): Recognize Qbox for filled box.
+	Exceptions are hollow boxes.
+	(Qbox, Qhollow): New variables.
+	(syms_of_w32fns): Initialize and staticpro them.
+
+	* w32term.h (FRAME_BLINK_OFF_CURSOR, FRAME_BLINK_OFF_CURSOR_WIDTH):
+	New macros.
+	(struct w32_output): New fields blink_off_cursor,
+	blink_off_cursor_width.
+	(FRAME_CURSOR_WIDTH): New macro.
+
+	* w32term.c (x_display_and_set_cursor): Use FRAME_BLINK_OFF_CURSOR
+	and FRAME_BLINK_OFF_CURSOR_WIDTH for blinking cursor off.
+
+	* w32term.c (x_display_and_set_cursor): Check FRAME_CURSOR_WIDTH
+	for bar cursor.
+
+	* w32term.c (expose_overlaps): New function.
+	(expose_window): Use it to fix the display of overlapping rows.
+
[phone]  Simon Josefsson  <[e-mail]>
+
+	* xfns.c (Fx_open_connection): Improve help when X connection
+	fails, xhost is insecure and xauth is better.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* makefile.w32-in: Add missing dependencies on w32term.h and
+	composite.h.
+
+	* emacs.c (USAGE1): Add missing newline.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* s/darwin.h [HAVE_LIBNCURSES]: Define HAVE_TERMINFO.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and
+	FRAME_BLINK_OFF_CURSOR_WIDTH using defaults and Vblink_cursor_alist.
+	(Vblink_cursor_alist): New variable.
+	(syms_of_xfns): Initialize and defvar it.
+	(x_specified_cursor_type): Recognize Qbox for filled box.
+	Exceptions are hollow boxes.
+	(Qbox, Qhollow): New variables.
+	(syms_of_xfns): Initialize and staticpro them.
+
+	* xterm.h (FRAME_BLINK_OFF_CURSOR, FRAME_BLINK_OFF_CURSOR_WIDTH):
+	New macros.
+	(struct x_output): New fields blink_off_cursor, blink_off_cursor_width.
+
+	* xterm.c (x_display_and_set_cursor): Use FRAME_BLINK_OFF_CURSOR
+	and FRAME_BLINK_OFF_CURSOR_WIDTH for blinking cursor off.
+
+	* emacs.c (main): Handle --script.
+	(USAGE1): Mention --script.
+	(standard_args): Define sort order for --script.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (redisplay_updating_p): Variable removed.
+	(inhibit_free_realized_faces, Qinhibit_free_realized_faces):
+	New variables.
+	(init_iterator): Don't free realized faces if
+	inhibit_free_realized_faces is set.
+	(redisplay_internal): Bind Qinhibit_free_realized_faces to nil.
+	(syms_of_xdisp): DEFVAR_BOOL inhibit-free-realized-faces,
+	initialize Qinhibit_free_realized_faces.
+
+	* dispextern.h (PRODUCE_GLYPHS): Set inhibit_free_realized_faces
+	when iterator is adding glyphs to a glyph matrix.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (get_next_display_element): In unibyte case, don't use
+	octal form for such eight-bit characters that can be converted to
+	multibyte char.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* frame.c (make_terminal_frame) [CANNOT_DUMP]: Initialize foreground
+	and background colors.  From Joe Buehler (tiny change).
+
[phone]  Miles Bader  <[e-mail]>
+
+	* bytecode.c (Fbyte_code): Fsub1 can GC, so protect it.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* emacs.c (main): Call init_mac_osx_environment if HAVE_CARBON is
+	defined instead of MAC_OSX.
+
+	* s/darwin.h (select): Define select to sys_select only if
+	HAVE_CARBON is defined.
+	(HAVE_WORKING_VFORK): #undef it.  Define vfork to fork.
+	(DONT_REOPEN_PTY): #def it.
+
+	* macterm.c (XTread_socket): Remove code to call
+	SendEventToEventTarget for keys with command modifiers when
+	mac_command_key_is_meta is nil.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* eval.c (Fdefvar): Fix last change.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (Fdefvar, Fdefconst, Fdefvaralias):
+	Record variables in load history as (defvar . VAR).
+	(Fdefvar): Don't record in load history if no initial value.
+	(Qdefvar): New variable.
+	(syms_of_eval): Init and staticpro it.
+
+	* lread.c (syms_of_lread): Doc fix.
+	(build_load_history): Use Fmember to see if a definition
+	is already in the Vload_history element.
+
+	* process.c (Fstart_process): Remove /: from program name.
+
+	* emacs.c (decode_env_path): Don't add /: if file name handler
+	has a `safe-magic' property.
+
+	* callproc.c (Fcall_process): Remove /: from program name.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* regex.c (PATFETCH): Remove the translating fetch.
+	(PATFETCH_RAW): Rename to PATFETCH.
+	(set_image_of_range): New fun.
+	(SET_RANGE_TABLE_WORK_AREA): Use it.
+	(regex_compile): Don't translate the pattern chars so eagerly.
+	Only do it when inserting an `exactn' bytecode or when handling
+	a char-range.
+	(mutually_exclusive_p): Avoid empty statement.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (redisplay_window): Do not `goto try_to_scroll' when we
+	end up on a partially visible line; this reverts a specific part
+	of the 2002-07-07 change by Richard M. Stallman to "fix" a nasty
+	display error which has been reported several times now.
+	However it introduces the problem that changes was supposed to fix.
+	See my comments in the source if you want to debug this further.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (croak): Add `void' to definition.
+
+	* sysdep.c [MSDOS] (request_sigio, unrequest_sigio):
+	Don't define them, they are defined in msdos.c.
+
+	* mem-limits.h [MSDOS]: Declare etext.
+
+	* fileio.c (Ffile_name_directory) [DOS_NT]: Don't declare `beg'
+	`const' since CORRECT_DIR_SEPS modifies its target.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (Fclear_this_command_keys): Added optional arg
+	KEEP-RECORD to avoid clearing lossage when we just want to clear
+	the current key sequence (kmacro needs this).
+
[phone]  Kenichi Handa  <handa@localhost>
+
+	* composite.c (run_composition_function): Call FUNC if it is fboundp.
+
+	* composite.h (COMPOSITION_MODIFICATION_FUNC): If PROP is not a
+	cons, return Qnil.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/sol2-5.h (BROKEN_SIGIO): Add #undef.
+
+	* sysdep.c [!VMS]: Include sys/files.h.
+
+	* editfns.c (save_restriction_restore): Defend from unchained marker.
+
+	* buffer.c (overlays_at): Handle extending vec uniformly.
+	(overlays_in): Handle extending vec from length 0 as in overlays_at.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* mac.c (init_mac_osx_environment): New function.
+
+	* emacs.c (main) [MAC_OSX]: Call init_mac_osx_environment.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macros.c (Fstart_kbd_macro): Added NO-EXEC argument to inhibit
+	executing macro before appending to it (when used from Lisp).
+	(Fexecute_kbd_macro): Added LOOPFUNC argument to supply function
+	which is called prior to each iteration of macro (for kmacro.el).
+	(Fend_kbd_macro, Fcall_last_kbd_macro): Likewise.
+
+	* lisp.h (Fexecute_kbd_macro): Update prototype.
+
+	* keyboard.c (Fcommand_execute): Update call to Fexecute_kbd_macro.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xselect.c (QUTF8_STRING): New variable.
+	(symbol_to_x_atom): Pay attention to QUTF8_STRING.
+	(x_atom_to_symbol): Likewise.
+	(x_get_local_selection): New argument local_request.  If it is
+	nonzero, call handler_fn with the second arg nil.
+	(x_handle_selection_request): Call x_get_local_selection with
+	local_request 0.
+	(lisp_data_to_selection_data): Don't encode the string here.
+	(Fx_get_selection_internal): Call x_get_local_selection with
 	local_request 1.
 	(syms_of_xselect): Intern and staticpro QUTF8_STRING.
 
@@ -2050,7 +3422,948 @@
 	to SCROLL_BAR_CLICK_EVENT, w32_scroll_bar_click to
 	W32_SCROLL_BAR_CLICK_EVENT, selection_request_event to
 	SELECTION_REQUEST_EVENT, selection_clear_event to
-	SELECTION_CLEAR_EVENT, buffer_sw
+	SELECTION_CLEAR_EVENT, buffer_switch_event to BUFFER_SWITCH_EVENT,
+	delete_window_event to DELETE_WINDOW_EVENT, iconify_event to
+	ICONIFY_EVENT, deiconify_event to DEICONIFY_EVENT,
+	menu_bar_activate_event to MENU_BAR_ACTIVATE_EVENT, drag_n_drop to
+	DRAG_N_DROP_EVENT, save_session_event to SAVE_SESSION_EVENT and
+	no_event to NO_EVENT.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* macmenu.c: Remove declaration of Qmouse_click and Qevent_kind.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* intervals.c (textget): Don't forget to `return'.
+	(lookup_char_property): Use XCAR/XCDR.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): Fix typo.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xdisp.c (Fformat_mode_line): New function.
+	(frame_title_buf, frame_title_buf_end, frame_title_ptr)
+	(store_frame_title_char, store_frame_title): Use unconditionally.
+	(init_xdisp): Defsubr Fformat_mode_line.
+	Initialize frame_title_buf etc. unconditionally.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (read_key_sequence):
+	Remove prev_(fkey|keytran}_(map|start|end) since we don't want to pass
+	things through those maps after downcasing events.
+	Enforce that keytran_end <= fkey_start, i.e. that key-translation-map
+	applies after function-key-map.
+	Make sure that keytran can be done in the middle in the sequence.
+	Be careful not to throw away events past the one we downcase.
+
+	* lread.c (read_integer): Remove unused var `tem'.
+	(read1): Fix int/Lisp_Object mixup.
+
+	* xfaces.c (tty_lookup_color): Type bool/Lisp_Object mismatch fixed.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (readable_events): Ignore any number of
+	FOCUS_IN_EVENT events and return 0 if nothing else in buffer.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfaces.c (Ftty_supports_face_attributes_p): New function.
+	(parse_rgb_list, tty_lookup_color): New functions.
+	(tty_defined_color): Use `tty_lookup_color' to do all the work.
+	(color_distance, Fcolor_distance): New functions.
+	(TTY_SAME_COLOR_THRESHOLD): New macro.
+	(Qtty_color_standard_values): New variable.
+	(syms_of_xfaces): Initialize new vars & functions.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* textprop.c (Vchar_property_alias_alist): New variable.
+	(syms_of_textprop) <Vchar_property_alias_alist>: DEFVAR_LISP.
+
+	* intervals.c (lookup_char_property): New function for looking up
+	overlay and text properties, created from textget.
+	(textget): Use it.
+
+	* intervals.h (lookup_char_property): Declare.
+	(Vchar_property_alias_alist): Declare.
+
+	* buffer.c (Foverlay_get): Use lookup_char_property.
+
[phone]  Sam Steingold  <[e-mail]>
+
+	* xselect.c (lisp_data_to_selection_data): Fix last change:
+	*data_ret is not a Lisp string, while unibyte_string is.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xselect.c (lisp_data_to_selection_data): Fix last change:
+	set size_ret.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* m/amdx86-64.h: New file.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* fns.c (Fstring_make_unibyte): Doc fix.
+
+	* xselect.c (lisp_data_to_selection_data): If the requested type
+	 is STRING, call string_make_unibyte to encode the selected text
+	 as a string.
+
+	* window.c (Fset_window_hscroll): Doc fix.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* fileio.c (choose_write_coding_system):
+	Call select-safe-coding-system properly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (message_with_string): Error if STRING is not a string.
+
+	* fns.c (md5): Pass FILE arg to Vselect_safe_coding_system_function.
+
+	* fileio.c (choose_write_coding_system): Pass FILE arg to
+	Vselect_safe_coding_system_function.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* buffer.c (fix_overlays_before): Fix list-walking bug in 05-19 change.
+
[phone]  Thien-Thi Nguyen  <[e-mail]>
+
+	* bytecode.c (Fbyte_code): Cast `current_column' return value to int.
+	* cmds.c (Fdelete_backward_char, internal_self_insert): Likewise.
+	* keymap.c (describe_command): Likewise.
+	* minibuf.c (read_minibuf): Likewise.
+
+	* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
+	Cast `current_column' return value to int.
+	(back_to_previous_visible_line_start)
+	(reseat_at_next_visible_line_start, next_element_from_buffer):
+	Cast `indented_beyond_p' 3rd arg to float.
+
+	* indent.c (last_known_column): Now a float.
+	(current_column_1, position_indentation, current_column)
+	(string_display_width): Return float.
+	(Fcurrent_column): Cast `current_column' return value to int.
+	(Fcurrent_indentation): Cast `position_indentation' retval to int.
+	(indented_beyond_p): Third arg now a float.
+	(compute_motion, vmotion): Cast `indented_beyond_p' 3rd arg to float.
+
+	* lisp.h (current_column): Now returns float.
+	(indented_beyond_p): 3rd arg now a float.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xfns.c (x_encode_text): Return stringp non-NULL if coding_system
+	is Qcompound_text_with_extensions.
+
+	* xselect.c (lisp_data_to_selection_data): Always set selection
+	type as string if x_encode_text returns streingp non-NULL.
+
+	* s/netbsd.h: Include /usr/pkg in the run time shared library path.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (Fset_window_configuration): Correct the handling
+	of point in current buffer, to work with multiple windows.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* lread.c (Fread_from_string): Don't depend on order of evaluation
+	for C function parameters.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (x_display_and_set_cursor): Change the cursor in the same
+	way for blinked-off state and for a nonselected window.
+
+	* window.c (window_scroll_pixel_based): Don't call Fbolp;
+	instead, see if the new start pos is at beginning of line.
+
+	* fileio.c (Fwrite_region): If START is a string, don't
+	make any annotations.
+
+	* eval.c (syms_of_eval): Doc fix.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* emacs.c (USAGE1): Add --no-splash.
+	(standard_args): Ditto.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* lread.c (readchar_count): New variable.
+	(readchar): Increment it.
+	(unreadchar): Decrement it.
+	(read_multibyte): Decrement it.
+	(Vread_with_symbol_positions): New variable.
+	(Vread_symbol_positions_list): New variable.
+	(read_internal_start): New function, created from Fread and
+	Fread_from_string.  Handle Vread_symbol_positions_list and
+	Vread_with_symbol_positions.
+	(readevalloop, Fread, Fread_from_string): Use it.
+	(read1): Use readchar_count to add symbol positions to
+	Vread_symbol_positions_list if Vread_with_symbol_positions is non-nil.
+	(syms_of_lread): DEFVAR_LISP and initialize them.
+
+	* lread.c (read0, read1, read_list, read_vector, read_multibyte)
+	(substitute_object_recurse, substitute_object_in_subtree)
+	(substitute_in_interval): Prototype.
+	(read_multibyte): Return c if it's less than zero.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fileio.c (Fread_file_name_internal): Added brute-force
+	speed up for using predicate file-directory-p.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* fileio.c (Vread_file_name_function, Vread_file_name_predicate):
+	New variables.
+	(syms_of_fileio): DEFVAR_LISP them.
+	(read_file_name_cleanup): New unwind function.
+	(Fread_file_name_internal): Only return completions satifying
+	Vread_file_name_predicate.  Temporarily unwind protect and rebind
+	default-directory while checking completions against the predicate.
+	(Fread_file_name): Added PREDICATE argument.  Specbind it to
+	Vread_file_name_predicate during completion.
+	Call Vread_file_name_function to read the file name if non-nil.
+
+	* lisp.h (Fread_file_name): Now has 6 args.
+
+	* callint.c (Fcall_interactively) <"D">: Supply Qfile_directory_p
+	predicate for Fread_file_name when reading directory name.
+	Supply Qnil for predicate in other calls to Fread_file_name.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* term.c (tty_capable_p): New function.
+	* dispextern.h (tty_capable_p): New function declaration.
+	(TTY_CAP_INVERSE, TTY_CAP_UNDERLINE, TTY_CAP_BOLD, TTY_CAP_DIM)
+	(TTY_CAP_BLINK, TTY_CAP_ALT_CHARSET): New macros.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (read_non_regular, Finsert_file_contents): Use BEG_BYTE.
+	(Finsert_file_contents, build_annotations): Use XCAR, XCDR.
+	(Vwrite_region_annotate_functions): Docstring fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xterm.c (x_write_glyphs): Clear phys_cursor_on_p if current
+	phys_cursor's hpos is overwritten.  This is still not completely
+	correct, as it doesn't really make sense to use hpos at all to
+	get the cursor glyph (as that is relative to the width of the
+	characters on the line, which may have changed during the update).
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (enumfont_t): Remove tail, make pattern a normal
+	Lisp_Object.
+	(enum_font_cb2, enum_font_maybe_add_to_list, w32_list_fonts):
+	Use modified enumfont_t struct.
+
+	* w32term.h (text_cursor_kinds): New enumeration member HBAR_CURSOR.
+
+	* w32term.c (x_draw_bar_cursor): New argument KIND; callers changed.
+	Handle the `hbar' cursor type.
+	(x_display_and_set_cursor): Handle the HBAR_CURSOR case.
+
+	* w32fns.c (Qhbar): New variable.
+	(x_specified_cursor_type): Use it.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* w32fns.c (enum_font_maybe_add_to_list): Use XCDR_AS_LVALUE for
+	now, when the address is needed.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* Makefile.in (shortlisp): Add font-core.el.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
+	* keyboard.c (read_char_minibuf_menu_prompt): Don't list
+	equivalent key bindings here.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	Change symbol structure to contain a lisp object for the symbol
+	name:
+	* lisp.h (struct Lisp_Symbol): Replace field "name" with a lisp
+	object field named "xname".
+	(SYMBOL_NAME): New macro.
+	* abbrev.c (write_abbrev): Use SYMBOL_NAME instead of XSYMBOL and
+	name field.
+	* alloc.c (Fmake_symbol): Set symbol xname field instead of name.
+	(mark_object, gc_sweep): Use symbol xname field and XSTRING
+	instead of name field.
+	* buffer.c (buffer_slot_type_mismatch): Use XSTRING and
+	SYMBOL_NAME instead of XSYMBOL and name field.
+	* callint.c (Fcall_interactively): Use XSTRING and SYMBOL_NAME
+	instead of XSYMBOL and name field.
+	* charset.c (Fdefine_charset, Fdeclare_equiv_charset): Use XSTRING
+	and SYMBOL_NAME instead of XSYMBOL and name field.
+	* coding.c (Fread_coding_system, code_convert_region1)
+	(code_convert_string1, code_convert_string_norecord)
+	(Ffind_operation_coding_system): Use SYMBOL_NAME instead of
+	XSYMBOL and name field.
+	* data.c (Fkeywordp, Fsymbol_name, store_symval_forwarding)
+	(Fmake_variable_buffer_local, Fmake_local_variable)
+	(Fmake_variable_frame_local): Use SYMBOL_NAME and XSTRING instead
+	of XSYMBOL and name field.
+	* editfns.c (Fformat): Use SYMBOL_NAME and XSTRING instead of
+	XSYMBOL and name field.
+	* emacs.c (shut_down_emacs) [#if 0]: Use SYMBOL_NAME and XSTRING
+	instead of XSYMBOL and name field.
+	* eval.c (do_autoload): Use SYMBOL_NAME and XSTRING instead of
+	XSYMBOL and name field.
+	* fns.c (Fstring_equal, Fstring_lessp, Frequire, sxhash):
+	Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field.
+	* fontset.c (Fset_fontset_font): Use SYMBOL_NAME and XSTRING
+	instead of XSYMBOL and name field.
+	* keyboard.c (echo_char, record_char, parse_modifiers_uncached)
+	(parse_modifiers, apply_modifiers, Fevent_convert_list)
+	(parse_solitary_modifier, Fexecute_extended_command):
+	Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field.
+	* keymap.c (silly_event_symbol_error, Fsingle_key_description)
+	(Fdescribe_buffer_bindings): Use SYMBOL_NAME and XSTRING instead
+	of XSYMBOL and name field.
+	(describe_command, describe_translation): Use SYMBOL_NAME and
+	assignment instead of XSYMBOL and name field and XSETSTRING.
+	* lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
+	instead of XSYMBOL and name field.
+	(Funintern): Use SYMBOL_NAME and assignment instead of XSYMBOL and
+	name field and XSETSTRING.
+	* macfns.c (parse_image_spec): Use SYMBOL_NAME and XSTRING instead
+	of XSYMBOL and name field.
+	* minibuf.c (Fread_command, Fread_variable): Use SYMBOL_NAME and
+	assignment instead of XSYMBOL and name field and XSETSTRING.
+	* print.c (print_error_message, print_object): Use SYMBOL_NAME and
+	XSTRING instead of XSYMBOL and name field.
+	* process.c (set_socket_options, Fsignal_process): Use SYMBOL_NAME
+	and XSTRING instead of XSYMBOL and name field.
+	* w32fns.c (parse_image_spec, w32_parse_hot_key): Use SYMBOL_NAME
+	and XSTRING instead of XSYMBOL and name field.
+	* xfaces.c (merge_face_vector_with_property): Use SYMBOL_NAME and
+	XSTRING instead of XSYMBOL and name field.
+	* xfns.c (parse_image_spec): Use SYMBOL_NAME and XSTRING instead
+	of XSYMBOL and name field.
+	* xselect.c (symbol_to_x_atom, x_get_foreign_selection):
+	Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* lisp.h (LISP_MAKE_RVALUE): Delete disabled version, making XCAR
+	and XCDR real rvalues in most configurations.
+
+	* buffer.c (fix_overlays_in_range, fix_overlays_before):
+	Don't take the address of the cdr part of a cons cell; instead, track
+	the parent cell and call XSETCDR, or set the variable for the head
+	of the list if we haven't started down the list yet.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* doc.c (reread_doc_file): Don't ask for confirmation.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (w32_create_pixmap_from_bitmap_data): New function.
+	(xbm_load_image): Use it.
+	(xbm_load): Ditto.
+	(xbm_read_bitmap_data): Reverted to xfns.c version.
+	From David Ponce <[e-mail]>.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (sig_suspender, sigprocmask): Don't define for DJGPP
+	2.02 and later.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* keyboard.c (Fthis_command_keys, Fthis_command_keys_vector): Fix typo.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (read_char_x_menu_prompt): Use an equivalent but more
+	meaningful test.
+	(read_char_minibuf_menu_prompt): Fix typo.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* eval.c (Fcommandp): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keymap.c (keymap_parent): New fun, extracted from Fkeymap_parent.
+	(Fkeymap_parent, keymap_memberp, fix_submap_inheritance): Use it.
+	(Fset_keymap_parent): Gcpro a bit more.
+	(access_keymap): Gcpro around meta_map call and around the main loop.
+	(get_keyelt): Gcpro when following indirect references.
+	(copy_keymap_item): New fun, extracted from Fcopy_keymap.
+	(copy_keymap_1, Fcopy_keymap): Use it.  Don't copy the parent map.
+	(Fdefine_key, Flookup_key): Gcpro before calling get_keymap.
+	Remove useless ad-hoc remap code.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (search_buffer): Give up boyer moore search if inverse
+	translation change charset_base.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* coding.c (decode_coding) <coding_type_ccl>: If a lone CR
+	characters is carried over from the previous block of text, adjust
+	coding->produced to account for the extra character.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* coding.c (intersection): Keep the elements of the returned list
+	in the same order as in the first list.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keymap.c (current_minor_maps): Fixed 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
+	later on, so I rewrote the code to use malloc/bcopy/free instead
+	of realloc.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (enum_font_cb2): Avoid DBCS raster fonts.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* coding.c (encode_coding_sjis_big5): Enclose bitwise AND in
+	parens, to ensure correct evaluation order.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keymap.c (Vemulation_mode_map_alists): New variable.
+	(syms_of_keymap): DEFVAR_LISP it.
+	(current_minor_maps): Process keymap alists in that list before
+	minor-mode-overriding-map-alist and minor-mode-map-alist.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* search.c (Freplace_match): Doc fix.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* macterm.c (x_draw_image_foreground, x_draw_image_foreground_1):
+	Enlarge cursor rectangle drawn around image with non-zero relief.
+
+	* w32term.c (x_draw_image_foreground, w32_draw_image_foreground_1):
+	Enlarge cursor rectangle drawn around image with non-zero relief.
+
+	* xterm.c (x_draw_image_foreground, x_draw_image_foreground_1):
+	Enlarge cursor rectangle drawn around image with non-zero relief.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xselect.c (lisp_data_to_selection_data): Don't set selection
+	type if comes from the Lisp object's car.  If the selection
+	contains a pure ASCII text, always return QSTRING as its type.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* mac.c (mac-cut-function): Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/gnu.h [DOUG_LEA_MALLOC] (REL_ALLOC): Undefine it.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* keyboard.c (make_lispy_event) <mouse-wheel>: Set count to 1
+	for event-click-count.
+
+	* process.c (init_process): Only add server subfeature if we can
+	use non-blocking I/O.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* macterm.c (XTread_socket): Call WaitNextEvent once instead of
+	repeatedly.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* process.c (Fmake_network_process): Only support server sockets
+	when we can make them non-blocking.
+
+	* s/ms-w32.h (HAVE_SELECT): Define.
+
+	* w32.h (FILE_NDELAY): New flag.
+
+	* w32.c (sys_getpeername, fcntl): New functions.
+	(_sys_read_ahead): Temporarily block on non-blocking sockets.
+
+	* w32proc.c: include sys/file.h.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* callproc.c (Vgame_score_directory): Renamed to
+	Vshared_game_score_directory.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/gnu.h [emacs]: Include stdio.h.
+	(GNU_LIBRARY_PENDING_OUTPUT_COUNT): New definition, conditional.
+
+	* eval.c (do_autoload): Error if called while preparing to dump.
+
+	* fns.c (Frequire): Error if need to load while preparing to dump.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* callproc.c (Vgame_score_directory) [!HAVE_SHARED_GAME_DIR]:
+	Default to "~/.emacs.d/games".
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (openp): Change arg exec_only to predicate.
+	(build_load_history): Use XCAR/XCDR.
+	(Flocate_file_internal): New fun.
+	(syms_of_lread): Defsubr it.
+	(Fload): Update call to openp.
+
+	* lisp.h (openp): Update prototype.
+
+	* xfns.c (x_create_bitmap_from_file, x_find_image_file):
+	* w32proc.c (sys_spawnve):
+	* w32fns.c (x_create_bitmap_from_file, x_find_image_file):
+	* w32.c (check_windows_init_file):
+	* sound.c (Fplay_sound_internal):
+	* process.c (Fstart_process):
+	* macfns.c (x_create_bitmap_from_file, x_find_image_file):
+	* mac.c (run_mac_command):
+	* emacs.c (init_cmdargs):
+	* callproc.c (Fcall_process): Update call to openp.
+
+	* textprop.c (remove_properties): Don't use XCAR without CONSP.
+
+	* xterm.c (XTread_socket): Disable the Xutf8LookupString code.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* dispextern.h (DEFAULT_TOOL_BAR_BUTTON_MARGIN)
+	(DEFAULT_TOOL_BAR_BUTTON_RELIEF): Change default values.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* minibuf.c (Fall_completions, Ftry_completion): New arg to Fcommandp.
+
+	* eval.c (Fcommandp): New arg for_call_interactively.
+	* lisp.h (Fcommandp): Declare new arg.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32proc.c (syms_of_w32proc): Get true file attributes by default.
+
+	* w32.c (stat, fstat): Use file index information to generate
+	inodes for directories where available.
+
[phone]  Andrew Choi  <[e-mail]>
+
+	* Makefile.in (C_SWITCH_SYSTEM_TEMACS): Add.
+	[HAVE_CARBON]: Include Mac object files.
+
+	* alloc.c, callproc.c, dispextern.h, dispnew.c, emacs.c,
+	fontset.c, frame.c, frame.h, keyboard.c, sysdep.c, term.c,
+	termcap.c, window.c, xdisp.c, xfaces.c: Use macros MAC_OS8,
+	MAC_OSX, and MAC_OS instead of macintosh.
+
+	* editfns.c [MAC_OS8]: Include stdio.h.
+
+	* emacs.c [MAC_OS8]: Call mac_initialize instead of x_term_init.
+
+	* fontset.c [MAC_OS]: Set Vdefault_fontset to ETL Fixed instead of
+	Apple Monaco.
+
+	* process.c: Declare QCfamily and QCfilter as extern.
+	(wait_reading_process_input) [MAC_OSX]: Clear bit for stdin before
+	calling select.
+
+	* termcap.c [MAC_OSX]: Don't define tgetnum, PC, tputs, and tgetent.
+
+	* tparam.c [MAC_OSX]: Don't define BC and UP.
+
+	* config.in [HAVE_CARBON]: Add.
+
+	* mac.c, macgui.h, macfns.c, macmenu.c, macterm.c, macterm.h:
+	Move here from mac/src and mac/inc.
+
+	* s/darwin.h, m/powermac.h, unexmacosx.c: New files.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (x_draw_phys_cursor_glyph): Undo last change.
+	Compute phys_cursor_width from the x position returned
+	by x_draw_glyhs, which is cheaper.
+	(x_display_and_set_cursor): Compute the buffer-local value
+	of `cursor-in-non-selected-windows' only when needed.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (x_draw_phys_cursor_glyph): Take into account that a box
+	cursor on a stretch glyph has a width that depends on
+	x_stretch_cursor_p.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* abbrev.c (abbrev-start-location): Doc fix.
+
+	* indent.c (Fvertical_motion): Fix last change.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* indent.c (Fvertical_motion): Move to the start of the line
+	containing PT before moving up or down.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* dispnew.c (update_text_area): Set phys_cursor_on_p to 0 in the
+	case of writing a whole row, more or less analogous to the case of
+	writing only parts of a row.
+
+	* xterm.c (x_display_and_set_cursor): Set phys_cursor_width to
+	0 for NO_CURSOR.
+
+	* xterm.c (notice_overwritten_cursor): Fix an off by 1 error.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Doc fix.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (notice_overwritten_cursor): Handle the special case
+	of the cursor being in the first blank non-text line at the
+	end of a window.
+
+	* xterm.c (x_draw_hollow_cursor, x_draw_bar_cursor)
+	(x_draw_phys_cursor_glyph): Set phys_cursor_width here.
+	(x_display_and_set_cursor): Don't set phys_cursor_width here, for
+	bar cursors only, to make phys_cursor_width contain what its name
+	suggests.
+	(notice_overwritten_cursor): Consider the cursor image erased if
+	the output area intersects the cursor image in y-direction.
+
[phone]  Simon Marshall  <[e-mail]>
+
+	* xfns.c (x_set_mouse_color): Change default for cross_cursor
+	to XC_hand2.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xdisp.c: Remove unused global variable `minibuf_prompt_pixel_width'.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* textprop.c (remove_properties): Fixed trap for malformed plist.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* cmds.c (Fend_of_line): Handle intangible text in mid line.
+
+	* window.c (make_window): Initialize height_fixed_p,
+	last_cursor_off_p, and p->cursor_off_p slots.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* fns.c (use-dialog-box): Doc fix.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xterm.c (note_mode_line_or_margin_highlight): Remove unused
+	variables `row', `i' and `area'.
+	(XTread_socket) <KeyPress>: Pass KeyPress events when in menu to
+	toolkit library.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfaces.c (clear_font_table): Don't free the default font of
+	a frame even if it's on another display.
+	(Finternal_set_lisp_face_attribute): Don't use XFRAME on something
+	that could be Qt.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* indent.c (Fmove_to_column): Remove unused local variable
+	`next_boundary_byte'.
+	(current_column_1): Likewise.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (Qhbar): New variable.
+	(syms_of_msdos): Intern and staticpro it.
+	(IT_set_cursor_type, IT_set_frame_parameters): Handle the `hbar'
+	cursor type.
+
[phone]  Dave Lambert  <[e-mail]>
+
+	Theses change implement an underscore-like (`hbar') cursor.
+
+	* xterm.h (text_cursor_kinds): New enumeration member HBAR_CURSOR.
+
+	* xterm.c (x_draw_bar_cursor): New argument KIND; callers changed.
+	Handle the `hbar' cursor type.
+	(x_display_and_set_cursor): Handle the HBAR_CURSOR case.
+
+	* xfns.c (Qhbar): New variable.
+	(syms_of_xfns): Intern and staticpro it.
+	(x_specified_cursor_type): Handle `hbar' cursor.
+
+	* s/sol2-5.h (bcopy, bzero, bcmp): Define only if HAVE_BCOPY is
+	not defined.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* textprop.c (remove_properties): New arg LIST allows scanning
+	either a list or a plist.
+	(interval_has_some_properties_list): New function, like
+	interval_has_some_properties using list instead of plist.
+	All callers changed.
+	(Fremove_list_of_text_properties): New function.
+	(syms_of_textprop): Defsubr it.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* s/sol2.h (HAVE_LIBKSTAT): Define only if not already defined.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* indent.c (Fmove_to_column): Remove unused local variable `end_byte'.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* window.c (coordinates_in_window): Don't report on margin area
+	if its width is zero.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (Fx_file_dialog): Decode file name before using.
+
+	* w32term.c (construct_drag_n_drop): Likewise.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 830000, since we now
+	store load-history in pure space.
+
+	* s/msdos.h (SYSTEM_PURESIZE_EXTRA): Reduce to 50000.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xterm.c (Qlatin_1, Qutf_8): New vars.
+	(syms_of_xterm): Initialize them.
+	(XTread_socket): Eliminate incorrect optimization that tried to avoid
+	decoding the output of X*LookupString.
+	Always use latin-1 to decode the output of XLookupString.
+	Try Xutf8LookupString if XmbLookupString failed.
+
+	* region-cache.c (new_region_cache): Use BEG.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* buffer.c (MMAP_ALLOCATED_P): New macro to be set from system
+	configuration files.
+	(mmap_enlarge): Enlarge mapped regions only if MMAP_ALLOCATED_P
+	returns 0.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* config.in: Regenerated using autoheader.
+
+	* m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/alpha.h,
+	m/altos.h, m/amdahl.h, m/apollo.h, m/arm.h, m/att3b.h, m/aviion.h,
+	m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h,
+	m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/gec63.h,
+	m/gould.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ia64.h,
+	m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h,
+	m/ibms390.h, m/intel386.h, m/iris4d.h, m/irist.h, m/isi-ov.h,
+	m/m68k.h, m/macppc.h, m/masscomp.h, m/mg1.h, m/mips-siemens.h,
+	m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h
+	m/ns32000.h, m/orion.h, m/pfa50.h, m/plexus.h, m/pmax.h,
+	m/powerpcle.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h,
+	m/sparc.h, m/sr2k.h, m/symmetry.h, m/tad68k.h, m/tahoe.h,
+	m/targon31.h, m/tek4300.h, m/tekxd88.h, m/template.h, m/tower32.h,
+	m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/windowsnt.h,
+	m/xps100.h, s/aix3-2.h, s/aix4-2.h, s/irix4-0.h, s/irix5-0.h,
+	s/sco5.h, s/unixware.h: Don't set HAVE_ALLOCA, C_ALLOCA and
+	STACK_DIRECTION, now set by autoconf.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* dispnew.c (marginal_area_string): Sort arguments.
+
+	* dispextern.h (marginal_area_string): Add prototype.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents):
+	Don't call temp_output_buffer_setup--do just part, by hand.
+
+	* coding.c (run_pre_post_conversion_on_str):
+	Don't call temp_output_buffer_setup--do just part, by hand.
+
+	* keyboard.c (command_loop_1): Don't call start_hourglass
+	or cancel_hourglass when executing a macro.
+
+	* marker.c (count_markers): New function.
+
+	* xdisp.c (display_mode_element): Don't let mode_line_proptrans_alist
+	grow without limit.  Move recently used elements to the front.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* unexelf.c (unexec) [__sgi]: Undo the change from 2002-01-20.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (sync_frame_with_window_matrix_rows): Don't give frame
+	rows marginal areas.
+	(Fdump_frame_glyph_matrix) [GLYPH_DEBUG]: New function.
+	(syms_of_xdisp) [GLYPH_DEBUG]: Defsubr it.
+
+	* dispnew.c (marginal_area_string): Check that glyph row is enabled.
+
[phone]  Dave Love  <[e-mail]>
+
+	* dispnew.c (marginal_area_string): New.
+
+	* window.c (window_part): Add ON_LEFT_MARGIN, ON_RIGHT_MARGIN.
+	(Qleft_margin, Qright_margin): Declare.
+	(coordinates_in_window, (Fcoordinates_in_window_p): Deal with margins.
+
+	* xterm.c (note_mode_line_or_margin_highlight): Renamed from
+	note_mode_line_highlight and extended.
+
+	* keyboard.c (Qleft_margin, Qright_margin): Declare.
+	(make_lispy_event): Deal with mouse events in margins.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* msdos.c (dos_rawgetc): Use a single event for HELP_EVENT.
+
+	* keyboard.c (command_loop_1): Turn off transient-mark-mode rather
+	than deactivating the mark if tmm is set to `lambda'.
+	(gen_help_event, kbd_buffer_store_help_event, kbd_buffer_get_event):
+	Use a single event for HELP_EVENT.
+	(Fexecute_extended_command): Save last_point_position.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* lisp.h (Fpropertize): Add prototype.
+
+	* fns.c (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
+
[phone]  Colin Walters  <[e-mail]>
+
+	* config.in: Add HAVE_SHARED_GAME_DIR.
+
+	* callproc.c: (Vgame_score_directory): New variable.
+	(syms_of_callproc) <Vgame_score_directory>: DEFVAR_LISP.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Reduce again to avoid big excess.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* minibuf.c (read_minibuf): Use empty_string.
+	(Ftry_completion): Allow lambda forms and lists of strings for `alist'.
+	Short-circuit the search as soon as it "failed".
+	(Fall_completions): Allow lambda forms and lists of strings for alist.
+	(Fcompleting_read): Set Qminibuffer_completion_confirm to nil
+	when require_match is nil.
+	(Ftest_completion): Rename from `test_completion' and export to elisp.
+	Call the predicate also when alist is a list.
+	Obey Vcompletion_regexp_list.
+	(do_completion, Fminibuffer_complete_and_exit): Use it.
+	(Fassoc_string): Rename from `assoc_for_completion'.
+	Allow list of strings as well and export to elisp.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 900KB.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* w32.c (sys_accept): Don't hide variable `s'.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* callint.c (Fcall_interactively): Use INTEGERP instead of
+	NUMBERP for checking Vhistory_length.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* sound.c (Fplay_sound_internal): Renamed from Fplay_sound.
+	Doc fix to reflect it.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (display_mode_element): New arg RISKY.
+	Disregard text props found or specified within a variable
+	that isn't marked risky-local-variable.
+	(Qrisky_local_variable): New variable.
+	(syms_of_xdisp): Init and staticpro it.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* undo.c (record_point): New fun.
+	(record_delete, record_insert): Use it.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* doc.c (Fdocumentation): Add missing parentheses.
+	(Fdocumentation_property): Likewise.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* doc.c (Fdocumentation, Fdocumentation_property): When the doc
+	data is 0, just return nil.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (syms_of_msdos): Fix last change with
+	mouse_autoselect_window.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* w32term.c, xterm.c, msdos.c: Rename autoselect_window_p to
+	mouse_autoselect_window.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (make_lispy_event): Handle unknown keysyms together
+	with system-specific keysyms.  Use it also for unknown function keys.
+
+	* doc.c (reread_doc_file): Return whether reload was attempted.
+	(Fdocumentation, Fdocumentation_property): Don't try to reload
+	if the doc is 0 and only ask once.
+
+	* Makefile.in (lisp, shortlisp): Add ucs-tables.elc.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* keyboard.c (read_char): If the event was Qselect_window,
+	restore timer_idleness_start_time to its previous value.
+
+	* msdos.c (dos_rawgetc): Generate SELECT_WINDOW_EVENTs when required.
 
 2002-04-01  Stefan Monnier  <[e-mail]>
 
@@ -2505,25 +4818,27 @@
 	* lread.c (Fload): Don't assume that message_with_string uses the
 	string it is given like a C string.
 
-2002-03-10  Jan D.  <[e-mail]>
-
-	* xterm.h: Extern declare x_session_check_input () and
- 	x_session_initialize ().
-
-	* xterm.c: Added calls to x_session_check_input () and
- 	x_session_initialize ().
-
-	* termhooks.h (enum event_kind): Added save_session_event.
-
-	* keyboard.c: Added Emacs event save_session_event.
-
-	* emacs.c (main): Added call to syms_of_xsmfns ().
-
-	* lisp.h: Extern declare syms_of_xsmfns ().
-
-	* config.in: Added HAVE_X_SM
-
-	* Makefile.in: Added test for HAVE_X_SM and added new file xsmfns.c
[phone]  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
+	x_session_have_connection.
+	(x_initialize): Add call to x_session_initialize.
+
+	* termhooks.h (enum event_kind): Add save_session_event.
+
+	* keyboard.c: Add Emacs event save_session_event.
+
+	* emacs.c (main): Add call to syms_of_xsmfns.
+
+	* lisp.h: Declare syms_of_xsmfns as extern.
+
+	* config.in: Add HAVE_X_SM.
+
+	* Makefile.in (LIBXT): Add -lSM -lICE
+	if HAVE_X_SM and not USE_X_TOOLKIT.
+	(XOBJ): New file xsmfns.c added.
 
 	* xsmfns.c: New file for X session management.
 
@@ -2534,9 +4849,8 @@
 
 2002-03-08  Gerd Moellmann  <[e-mail]>
 
-	* xdisp.c (move_it_vertically_backward): At the end of the
-	function, when moving forward by lines, treat terminal frames
-	specially.
+	* xdisp.c (move_it_vertically_backward): At the end of the function,
+	when moving forward by lines, treat terminal frames specially.
 
 	* keyboard.c (echo_char): Make sure to add a separator between
 	keys even if echo_dash hasn't been called.
@@ -2606,7 +4920,7 @@
 	* sysdep.c (sys_subshell) [MSDOS]: If PWD is set in the
 	environment, pass it down with corrected value.
 
-2002-03-04  Pavel Jan,Bm(Bk  <[e-mail]>
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
 
 	* lread.c (read_filtered_event): Do not call start_hourglass
 	before returning.
@@ -2696,7 +5010,7 @@
 	(status_message): Convert Qfailed status.
 	(Fopen_network_stream): Added support for non-blocking connect.
 	New optional args: filter, sentinel, non_blocking.  Doc updated.
-	[HAVE_GETADDRINFO, !HAVE_GETADDRINFO]:  Merged common code.
+	[HAVE_GETADDRINFO, !HAVE_GETADDRINFO]: Merged common code.
 	(deactivate_process): Handle pending non-blocking connect.
 	(wait_reading_process_input): Poll for status of non-blocking
 	connects.  Exec sentinel directly when connect succeeds.
@@ -2736,8 +5050,7 @@
 
 2002-02-26  Eli Zaretskii  <[e-mail]>
 
-	* fileio.c (Fsubstitute_in_file_name): Fix the change from
-	2002-02-08.
+	* fileio.c (Fsubstitute_in_file_name): Fix the change from 2002-02-08.
 
 	* xselect.c (Qcompound_text_with_extensions): Renamed from
 	Qcompound_text_no_extensions.
@@ -2747,7 +5060,7 @@
 
 	* w32proc.c (syms_of_ntproc): Doc fix.
 
-2002-02-24  Pavel Jan,Bm(Bk  <[e-mail]>
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
 
 	* intervals.h: Include "dispextern.h" unconditionally.
 
@@ -2803,7 +5116,7 @@
 
 	* w32fns.c (w32_wnd_proc) <WM_TIMER>: Fix last change.
 
-2002-02-23  Pavel Jan,Bm(Bk  <[e-mail]>
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
 
 	* w32term.c (enter_timestamp): Remove unused static variable to
 	prevent warning.
@@ -2879,7 +5192,7 @@
 	(tool_bar_items): Likewise.
 	(current_active_maps): Removed unused (and buggy) function.
 
-2002-02-20  Pavel Jan,Bm(Bk  <[e-mail]>
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
 
 	* xfns.c (gif_load): Use correct width and height for GIF images.
 
@@ -2914,7 +5227,7 @@
 
 	* w32term.c (x_check_fullscreen, x_check_fullscreen_move)
 	(x_fullscreen_adjust): New functions.
-	(w32_read_socket) <WM_WINDOWPOSCHANGED>:  Don't	resize to
+	(w32_read_socket) <WM_WINDOWPOSCHANGED>: Don't	resize to
 	fullscreen.  Call x_check_fullscreen_move, and set the
 	want_fullscreen member of output_data.w32
 	<WM_ACTIVATE, WM_ACTIVATEAPP>: Call x_check_fullscreen.
@@ -2968,9 +5281,8 @@
 
 	* msdos.c (x_autoselect_window_p): New variable.
 	(syms_of_msdos): Defvar it.
-	(dos_rawgetc): If x_autoselect_window_p is set, select the window
-	in which the last mouse movement occured, unless it is already
-	selected.
+	(dos_rawgetc): If x_autoselect_window_p is set, select the window in
+	which the last mouse movement occured, unless it is already selected.
 
 	* xdisp.c (automatic_hscroll_margin, Vautomatic_hscroll_step):
 	New variables.
@@ -3450,7 +5762,1460 @@
 	* w32term.c (parse_button): New parameter xbutton.  Callers changed.
 	(w32_read_socket): Handle new "XBUTTON" messages.
 
-	* w32fns.
+	* w32fns.c (w32_pass_extra_mouse_buttons_to_system): New user option.
+	(syms_of_w32fns): DEFVAR_BOOL it.
+	(w32_wnd_proc): Handle new "XBUTTON" messages.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* keyboard.c (read_key_sequence): Remove unused variable `extra_maps'.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xterm.c (x_load_font): Never set fonts_changed_p to zero.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* .gdbinit (xbuffer): Remove address operator since data is now a
+	pointer.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* insdel.c (adjust_after_replace_noundo): New function.
+
+	* coding.c (code_convert_region): Don't copy old text if undo disabled.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xdisp.c (x_consider_frame_title): Don't count the tooltip frame
+	when checking for multiple frames.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (delete_window): Rewrite the code for changing the
+	selected window to handle the case where WINDOW is not a leaf.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* process.c (send_process): Set src_multibyte to 1 after the call
+	top setup_coding_system, not before the call.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xmenu.c (set_frame_menubar, xmenu_show):
+	(xdialog_show):	Initialize wv->help to Qnil.
+
+	* w32menu.c (single_submenu, set_frame_menubar, w32_menu_show):
+	(w32_dialog_show): Initialize wv->help to Qnil.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xmenu.c (single_submenu): Initialize wv->help to Qnil.
+
+	* w32menu.c (w32_menu_display_help): Revert last change.
+
+	* xmenu.c (menu_highlight_callback): Revert last change.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* insdel.c (make_gap_larger): Make sure buffer size does not
+	overflow range of int.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (x_draw_glyphs): Don't call notice_overwritten_cursor if
+	OVERLAPS_P.
+
+	* w32menu.c (w32_menu_display_help): Hide any tooltip window.
+
+	* w32fns.c (compute_tip_xy): If tooltip won't fit on the screen
+	to the left or to the right of the pointer, put it against
+	the left screen edge.
+	(x_frame_parms): Add missing braces around initializer.
+
+	* w32term.c (x_setup_relief_colors): Don't compute an image's
+	background color if it doesn't have a Pixmap.
+	(notice_overwritten_cursor): Don't depend on
+	output_cursor and updated_area.  Compare pixel coordinates with
+	window's cursor pixel coordinates.
+	(x_draw_glyphs, x_clear_end_of_line, show_mouse_face):
+	Call notice_overwritten_cursor with new arg list.
+	(show_mouse_face): Fix bug setting a row's mouse_face_p flag
+	unconditionally.
+	(x_draw_image_relief): Use predefined macro instead of
+	constant when the value of `tool_bar_button_relief' is negative.
+
+	* w32term.c (x_display_and_set_cursor): Fix PostMessage arg types.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (menu_highlight_callback): Hide any tooltip window.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (Fcurrent_active_maps): Put the `keymap' property map first.
+	(Fkey_binding): Try the `keymap' property map first.
+	(Fdescribe_buffer_bindings): Show `keymap' property bindings before
+	minor mode bindings.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (read_key_sequence): Fixed cast of submaps arg to bcopy.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (read_key_sequence): Handle the keymap property
+	before minor mode maps.
+
+	* editfns.c (Fformat): Update thissize from field_width
+	based on the actual width, in the string case.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* charset.h (UNIBYTE_STR_AS_MULTIBYTE_P): Parenthesize assignment
+	when used as truth value to prevent gcc warnings.
+
+	* sysdep.c, unexapollo.c, w32.c, w32bdf.c, w32heap.c, w32inevt.c,
+	* w32proc.c: Include <config.h>.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* eval.c (max_specpdl_size, max_lisp_eval_depth): Define as int,
+	not EMACS_INT, to make them compatible with DEFVAR_INT.
+	* lisp.h (max_specpdl_size): Adjust declaration.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (print_object): Test print_escape_nonascii only for
+	unibyte strings.
+	(PRINTPREPARE): Once again bind Qprint_escape_nonascii
+	when outputting to a multibyte buffer.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (print_object): In multibyte string, use hex escapes.
+	Use octal only for unibyte strings.
+	(PRINTPREPARE): Don't ever set Qprint_escape_nonascii.
+
+	* lread.c (read_escape): New arg BYTEREP for reporting whether
+	escape forces unibyte or multibyte.
+	(read1): When reading a string, take note of that info.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* abbrev.c (Fexpand_abbrev): Use NILP instead of implicit zero
+	comparison to test lisp value returned by Fget.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lisp.h (max_specpdl_size): Add declaration.
+
+	* fileio.c (Fdo_auto_save): If NO_MESSAGE, don't call push_message.
+
+	* keymap.c (silly_event_symbol_error): New subrtn, from Fdefine_key.
+	Handle modifier bits.  Correct typo in error message.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* abbrev.c: Use the plist of an abbrev for multiple params if nec.
+	(Fdefine_abbrev): New arg SYSTEM-FLAG for a system abbrev.
+	(Fdefine_global_abbrev, Fdefine_mode_abbrev):
+	Update calls to Fdefine_abbrev.
+	(write_abbrev): Update for changed data format.
+	Don't list "system" abbrevs.
+	(Fexpand_abbrev): Update use count with new data format.
+	(describe_abbrev): Update for changed data format.
+	(Fdefine_abbrev_table): Handle the new SYSTEM-FLAG.
+
+	* config.in (HAVE_MBSINIT): Add #undef.
+
+	* strftime.c (mbsinit): Define as no-op if not available.
+
+	* s/sco5.h (LIBX11_SYSTEM) [MOTIF]: Add -lgen.
+	(sigprocmask_set): Conditionalize decl on ! NOT_C_CODE.
+
+	* keymap.c (Flookup_key): Error message if key has wrong data type.
+	(Fdefine_key): Add error message for trying to bind [DEL], [RET], etc.
+	(exclude_key): New variable.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (x_setup_relief_colors): Don't compute an image's
+	background color if it doesn't have a Pixmap.
+
+	* xterm.c (notice_overwritten_cursor): Don't depend on
+	output_cursor and updated_area.  Compare pixel coordinates with
+	window's cursor pixel coordinates.
+	(x_draw_glyphs, x_clear_end_of_line, show_mouse_face):
+	Call notice_overwritten_cursor with new arg list.
+	(show_mouse_face): Fix bug setting a row's mouse_face_p flag
+	unconditionally.
+
+	* xdisp.c (try_scrolling) <PT below scroll margin>: Add the
+	height of the cursor line to the amount to scroll.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* intervals.c (set_point_both): The position after an invisible,
+	intangible character is not an acceptable stopping point.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* window.c (enlarge_window): In new preserve_before code, convert
+	CURBEG from lisp object to integer before doing arithmetic.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* bytecode.c (Fbyte_code): Undo previous change.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* keyboard.c (record_char): Ignore duplicate help-echo events only
+	separated by mouse-movement.  When tracking mouse, only record
+	first and last mouse-movement event in same window.
+	Don't record mouse-movement events in keyboard macros.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.c (enlarge_window): New arg PRESERVE_BEFORE.  Callers changed.
+	(Fenlarge_window): New arg PRESERVE_BEFORE.
+
+	* bytecode.c (Fbyte_code): Use Fstring_make_unibyte
+	instead of Fstring_as_unibyte.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	The following changes remove mocklisp support:
+
+	* mocklisp.h, mocklisp.c: Files removed.
+
+	* lisp.h: Remove declarations of variables `Vmocklisp_arguments',
+	`Qmocklisp' and `Qmocklisp_arguments'.
+	Remove prototype of syms_of_mocklisp.
+
+	* makefile.nt, makefile.w32-in, Makefile.in: Remove mocklisp files.
+
+	* callint.c: Do not include mocklisp.h.
+	(Fcall_interactively): Do not test for mocklisp case.
+
+	* eval.c: Remove variables `Qmocklisp_arguments',
+	`Vmocklisp_arguments' and `Qmocklisp'.  Remove prototype of ml_apply.
+	(Fprogn, Fwhile, Fcommandp, Feval, Ffuncall, funcall_lambda):
+	Do not test for mocklisp case.
+	(Fwhile): Remove unused variable `tem'.
+	(syms_of_eval): Remove variable `moclisp-arguments'.
+
+	* data.c (wrong_type_argument): Remove mocklisp case.
+
+	* doc.c (Fdocumentation): Remove mocklisp case.
+
+	* emacs.c (main): Do not call syms_of_mocklisp.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfns.c (compute_tip_xy): If tooltip won't fit on the screen
+	to the left or to the right of the pointer, put it against
+	the left screen edge.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (distclean): Remove .gdbinit if we are building
+	outside the source tree.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* w32.c (emacs_root_dir): New function.
+
+	* msdos.c (emacs_root_dir): New function.
+
+	* fileio.c (Fexpand_file_name) [DOS_NT]: Use the root directory
+	of the current drive as the fallback for default_directory.
+
+	* dired.c (file_name_completion): Run the elements of
+	completion-ignored-extensions through ENCODE_FILE.
+
+	* lisp.h (scmp): Remove prototype, since it's now a static
+	function private to dired.c.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* dired.c (scmp): Function moved from minibuf.c.
+	Delete multibyte handling--used only on encoded strings.
+
+	* minibuf.c (scmp): Function moved to dired.c.
+
+	* fns.c (merge): Add QUIT call.
+
[phone]  Dave Love  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): Add language/utf-8-lang.el,
+	language/georgian.el.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* Makefile.in (lisp, shortlisp): Synchronize with changes to
+	lisp/Makefile.in:DONTCOMPILE.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xdisp.c (window_box_height): Do not return negative values.
+	From Gerd Moellmann <[e-mail]>.
+
+	* keyboard.c (head_table): Add missing braces around initializer.
+
+	* term.c (keys): Likewise.
+
+	* xfns.c (x_frame_parms, visual_classes): Likewise.
+
[phone]  Sam Steingold  <[e-mail]>
+
+	* coding.c (DECODE_COMPOSITION_END): Fixed a typo in the last
+	patch (COMPOSING_P, not COMPOSING).
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fcompare_buffer_substrings): Add QUIT to main loop.
+
+	* coding.c (code_convert_region): Update coding->cmp_data->char_offset
+	before calling decode_coding.
+
+	* charset.c (Fdefine_charset): Call Fupdate_coding_systems_internal.
+
+	* coding.c (DECODE_COMPOSITION_END): Check for ! COMPOSING_P (coding)
+	instead of only for COMPOSITION_DISABLED.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* alloc.c (pure_alloc): After overflow, allocate just a small block.
+
+	* Makefile.in (xmenu.o, xterm.o, fontset.o): Depend on buffer.h.
+
+	* buffer.h (struct buffer): New field `display_error_modiff'.
+	* buffer.c (reset_buffer): Initialize `display_error_modiff'.
+
+	* window.c (Frecenter): Clear display_error_modiff field.
+
+	* xdisp.c (redisplay_window_0, redisplay_window_1): New functions.
+	Call redisplay_window, but not if display_error_modiff field says no.
+	(redisplay_window_error): New function.
+	(displayed_buffer): New variable.
+	(redisplay_internal, redisplay_windows): Call the new functions
+	instead of redisplay_window directly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keyboard.c (syms_of_keyboard) <double-click-fuzz>: Doc fix.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.w32-in (EMACSLOADPATH): Define.
+	($(EMACS)): Run `list-load-path-shadows' after dumping emacs.
+	(bootstrap-temacs): Remove dependency on bootstrap-clean.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xfns.c (x_report_frame_params): Make the scroll-bar-width frame
+	parameter have a numeric value all the time.
+
+	* w32fns.c (x_report_frame_params): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Doc fix.
+
+	* xdisp.c (CLEAR_FACE_CACHE_COUNT): Redefine as 500.
+	(redisplay_internal): Call clear_image_cache only for window terminals.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (move_it_vertically_backward): Change heuristic
+	for the case that we didn't move far enough initially.
+
+	* window.c (Frecenter): Simplify computation in the case of window
+	system frames and ARG < 0; use window_box_height.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* Makefile.in, mem-limits.h, dispnew.c, emacs.c, fileio.c:
+	* process.c, sysdep.c, unexec.c: Test GNU_LINUX, not LINUX.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* insdel.c (make_gap) [DOUG_LEA_MALLOC]: Call make_gap_smaller if
+	arg is negative.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* m/hp800.h: Split the __hpux conditional into the parts
+	that are right for GNU/Linux too and the parts that are not.
+	Use the former if GNU_LINUX.
+	(HAVE_ALLOCA, LOAD_AVE_TYPE, LOAD_AVE_CVT): New defs for GNU/Linux.
+
+	* s/gnu-linux.h (GNU_LINUX): Defined.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* macros.c, msdos.c, w16select.c: Change doc-string comments to
+	`new style' [w/`doc:' keyword].
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (w32_free_submenu_strings): Clear menu item struct
+	before using.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* dosfns.c: Change doc-string comments to `new style' [w/`doc:'
+	keyword].
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* dosfns.c (dos-display-scancodes, dos-decimal): Doc fix.
+
+	* s/hpux10.h (srand48): Don't undefine.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (_widget_value): Make `help' field a Lisp_Object.
+	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
+	Lisp_Object.
+	(w32_free_submenu_strings): Only free owner-drawn strings.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* COPYING: Moved back.
+
+	* charset.c (char_to_string_1, translate_char, Fdefine_charset):
+	Add parentheses around && within ||.
+
+	* indent.c (compute_motion): Likewise.
+
+	* intervals.c (merge_properties_sticky): Likewise.
+
+	* coding.c (setup_coding_system, shrink_encoding_region)
+	(Fdecode_sjis_char): Likewise.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xdisp.c (display_mode_element): Don't read past end of string if
+	it ends with '%'.
+
+	* alloc.c (inhibit_garbage_collection): Don't exceed value an int
+	can hold.
+
+	* data.c (Vmost_positive_fixnum, Vmost_negative_fixnum):
+	Rename from most_positive_fixnum and most_negative_fixnum, resp., and
+	type changed to Lisp_Object.
+	(syms_of_data): DEFVAR_LISP them.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* callproc.c (init_callproc): Set Vdata_directory based on the source
+	location whenever Emacs was run uninstalled.
+
[phone]  Paul Eggert  <[e-mail]>
+
+	* config.in (HAVE_WORKING_VFORK): New #undefs.
+	* process.c (create_process):
+	Use HAVE_WORKING_VFORK, not HAVE_VFORK.
+	* m/cnvrgnt.h (HAVE_VFORK): Remove #define.
+	* m/ibm370aix.h (HAVE_VFORK): Remove #undef.
+	* m/ibmps2-aix.h (HAVE_VFORK): Remove #define.
+	* m/intel386.h (HAVE_VFORK): Likewise.
+	* m/mips-siemens.h (HAVE_VFORK): Likewise.
+	* m/mips.h (HAVE_VFORK): Likewise.
+	* s/freebsd.h (vfork): Remove #define.
+	* s/lynxos.h (HAVE_VFORK): Remove #undef.
+	* s/usg5-4-2.h: Fix comment about vfork.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* s/hpux10.h (random): Add undef.
+	(HAVE_RANDOM): Define it just once.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* eval.c: Undo last change: the standard syntax is not wanted.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* xterm.c (x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
+	scroll bars of the frame before deleting the frame itself.  If the
+	frame has a widget, delete the frame with XtDestroyWidget, and do
+	not call XDestroyWindow before that.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	* xfns.c (x_report_frame_params): Return actual fringe widths.
+
+	* w32fns.c (x_report_frame_params): Return actual fringe widths.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* alloc.c (Fgarbage_collect): Shrink buffer gaps that are
+	excessively large.
+
+	* insdel.c (make_gap_larger): New function.
+	(make_gap_smaller): New function.
+	(make_gap) [USE_MMAP_FOR_BUFFERS || REL_ALLOC]:
+	Call make_gap_smaller if arg is negative.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* keyboard.c (kbd_buffer_store_event): Fix interrupt_signal prototype.
+	Pass a dummy argument when calling interrupt_signal.
+	(parse_menu_item): Mark disabled items before checking for empty def.
+	(read_char_minibuf_menu_prompt): Make safety more visible.
+	(read_key_sequence): Add a `first_unbound' variable.
+	Use it to detect C-c ESC ESC ESC ESC ... cases and drop the
+	unbound prefix as soon as we can detect it.
+
+	* doc.c (Fsnarf_documentation): Add prototype.
+	(get_doc_string): Handle negative arguments.
+	(Fdocumentation): Use AREF and ASIZE.
+	Move the calls to get_doc_string to a single place.
+	Don't confuse an interactive-spec for a docstring reference.
+	(Fdocumentation_property): Take advantage of the fact that
+	get_doc_string now ignores the sign of the docstring position.
+
+	* eval.c: Use standard syntax for usage in docstrings.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xterm.c (x_draw_image_relief): Use predefined macro instead of
+	constant when the value of `tool_bar_button_relief' is negative.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xmenu.c (menu_highlight_callback): Use `help' field as Lisp_Object.
+	(single_submenu, xmenu_show): Set `help' field as Lisp_Object.
+
+	* fileio.c (read_non_regular): Delete Fsignal call.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (run_hook_list_with_args): Undo last change.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (x_draw_fringe_bitmap): Always undo clipping.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* window.c (Qleft_fringe, Qright_fringe): Remove. Now in frame.c.
+
+	* w32term.h (WM_MOUSELEAVE, TME_LEAVE, TRACKMOUSEEVENT)
+	[!WM_MOUSELEAVE]: Define.
+
+	* w32menu.c (current_popup_menu, get_menu_item_info):
+	(set_menu_item_info): New vars.
+	(set_frame_menubar): Doc fix clarifying GC interaction with menus.
+	(w32_menu_show): Set current_popup_menu.
+	(add_menu_item): Allocate new strings for owner-drawn menu items
+	and help strings.
+	Use owner-draw for disabled menu items again.
+	(w32_menu_display_help): Ignore owner-drawn items and popup menus.
+	(w32_free_submenu_strings, w32_free_menu_strings): New functions.
+
+	* w32fns.c (trackmouse_window, track_mouse_event_fn): New vars.
+	(w32_wnd_proc) <WM_MOUSEMOVE>: Notice when mouse enters frame.
+	<WM_EXITMENULOOP>: Free menu strings.
+	<WM_MOUSELEAVE>: Stop tracking mouse.
+	(x_create_tip_frame): Specify no minibuffer, modeline or fringes.
+
+	* w32term.c (w32_read_socket) <WM_MOUSELEAVE>: Cancel help echo
+	and mouse face.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes add left-fringe and right-fringe
+	frame parameters to adjust fringe widths, or remove one or
+	both fringes.
+
+	* frame.h (struct frame): Remove trunc_area_pixel_width and
+	trunc_area_cols fields.
+	(Qleft_fringe, Qright_fringe): Declare.
+	(FRAME_RIGHT_FRINGE_WIDTH): New macro.
+
+	* frame.c (Qleft_fringe, Qright_fringe): New vars.
+	(syms_of_frame): Initialize them.
+
+	* window.c (coordinates_in_window): Handle separate left and right
+	fringe widths.
+
+	* xterm.h (struct x_output): Add left_fringe_width, right_fringe_width,
+	and fringe_cols fields.
+	(FRAME_FRINGE_BITMAP_WIDTH, FRAME_FRINGE_BITMAP_HEIGHT): Remove macros.
+	(FRAME_X_FRINGE_COLS): Use fringe_cols field.
+	(FRAME_X_FRINGE_WIDTH): Use fringes_extra field.
+	(FRAME_X_LEFT_FRINGE_WIDTH): Use left_fringe_width field.
+	(FRAME_X_RIGHT_FRINGE_WIDTH): Use right_fringe_width field.
+	(x_compute_fringe_widths): Add prototype.
+
+	* 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
+	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.
+	(x_compute_fringe_widths): New function.
+	(x_new_font, x_set_window_size_1): Use it.
+
+	* xfns.c (x_frame_parms): Add `left-fringe' and `right-fringe' parms.
+	(x_set_frame_parameters): Process `font' parameter before other
+	parameters as fringe widths depend on it.
+	(x_set_fringe_width): New function.
+	(x_figure_window_size): Use x_compute_fringe_widths.
+	(Fx_create_frame): Process `left-fringe' and `right-fringe' frame
+	parameters.
+
+	* widget.c (set_frame_size): Use x_compute_fringe_widths.
+	(EmacsFrameSetCharSize): Ditto.
+
+	* w32term.h: Merged changes from xterm.h.
+	* w32term.c: Merged changes from xterm.c.
+	* w32fns.c: Merged changes from xfns.c.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* COPYING: Removed.
+
[phone]  Dave Love  <[e-mail]>
+
+	* coding.c (syms_of_coding) <Qchar_coding_system>: Give it an
+	extra extra slot.
+	(detect_coding_mask): Fix call of detect_coding_iso2022.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* fileio.c (file-name-coding-system)
+	(default-file-name-coding-system): Doc fix (links to referenced
+	variables added).
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5):
+	Add dummy uses of gcproN variables.
+
+	* category.c (describe_category, describe_category_1)
+	(Fdescribe_categories): Remove.  (Moved to lisp/help-fns.el.)
+	(syms_of_category): Don't defsubr Sdescribe_categories.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Ffind_file_name_handler): Avoid initializer for `result'.
+
+	* Makefile.in (lispdir): New variable, referring to build dir.
+	(TAGS-LISP): Find Makefile in $(lispdir), not $(lispsource).
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32menu.c (w32_menu_display_help): Actually add the new argument
+	OWNER.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (add_menu_item): Do not use owner-draw for disabled
+	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
+	help event in the owner frame's keyboard buffer.
+
+	* w32fns.c (w32_wnd_proc) <WM_MENUSELECT>: Display help directly.
+	(Fx_show_tip): Don't subtract last width from row width.
+
+	* w32term.c (w32_read_socket) <WM_MENUSELECT>: Remove.
+	(w32_read_socket): Use EQ to compare frames.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if
+	OVERLAPS_P.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xdisp.c (message_dolog): Remove unused variables `gcpro2',
+	`gcpro3' and `gcpro4'.
+
+	* coding.c (decode_coding_string): Remove unused variable `gcpro1'.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* ccl.c: Use AREF and ASIZE.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lisp.h (run_hook_list_with_args): Remove.
+	(LIST_END_P): Fix call to wrong_type_argument.
+	(make_fixnum_or_float): Use EMACS_INT rather than int.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (syms_of_syntax): Remove defsubr of Sdescribe_syntax.
+	(describe_syntax, describe_syntax_1, Fdescribe_syntax): Remove.
+
+	* eval.c: Use AREF and ASIZE.
+	(Ffetch_bytecode): Add the file name to the error message.
+
+	* fileio.c (Ffind_file_name_handler): Give precedence to handlers
+	which match the end of the file-name.
+	(Fsubstitute_in_file_name): Don't signal an error if $ENVVAR
+	is not a valid env var, but leave it as is instead.
+
+	* keymap.c (access_keymap): Handle t bindings like nil bindings.
+	Make nil bindings in char-tables transparent.
+	(store_in_keymap): Turn a nil binding into a t binding for char-tables.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* textprop.c (set_text_properties_1): Allow START, END in either order.
+	Do nothing if range is empty.
+
+	* Makefile.in (mallocobj): Simplify logic using auxiliary vars.
+
+	* Makefile.in (mostlyclean): Delete bootstrap-emacs here.
+	(clean): Not here.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* textprop.c (set_text_properties_1): Clearly mark that the
+	interval should not be empty.
+
+	* intervals.c (graft_intervals_into_buffer):
+	Don't call set_text_properties_1 on an empty interval.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* unexelf.c (unexec): Index by n, not nn, when checking for ".sbss".
+
+	* callproc.c (Fcall_process): When we make a bigger buffer for bufptr,
+	don't lose the data in it.
+
[phone]  Juanma Barranquero  <[e-mail]>
+
+	* 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.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* xfaces.c (merge_face_heights): Coerce back to int explicitly.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* window.c (Fset_window_vscroll): Doc fix.  From Kalle Olavi
+	Niemitalo <[e-mail]>.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.h (FRAME_X_FRINGE_COLS): No fringe on tip frames.
+
+	* w32fns.c (x_create_tip_frame): Set frame's fringes_extra to 0.
+	(Fx_show_tip): Block input during frame creation.
+	(Fx_show_tip, Fx_hide_tip): Enable.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* lread.c (Fload): Detect recursive load error for more than 3
+	nestings of the same file.
+	(Vrecursive_load_depth_limit): Variable deleted.
+	(syms_of_lread) <recursive-load-depth-limit>: Variable deleted.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xfns.c (compute_tip_xy): Initialize root_x and root_y from
+	mouse position if either left or top is not specified.
+
+	* w32fns.c (w32_wnd_proc) <WM_MENUSELECT>: Revert last change.
+	<WM_WINDOWPOSCHANGING>: Let tip frames resize without restriction.
+	(my_create_tip_window, Fx_show_tip): Adjust size for external border.
+	(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.
+
+	* w32term.c (x_after_update_window_line): Doc fix.
+	(w32_read_socket): Doc fix.  Avoid SET_FRAME_GARBAGED for tip
+	frames.
+	<WM_SHOWWINDOW>: Redo mouse highlight when hiding tip frame.
+
+	* xdisp.c (prepare_menu_bars) [HAVE_WINDOW_SYSTEM]: Use tip_frame
+	for all Windowed systems.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (IT_clear_screen): If the frame's faces are not yet
+	realized, use the initial screen colors to clear the screen.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* textprop.c (Fset_text_properties): Remove unused variables
+	`unchanged', `prev_changed', `s' and `len'.
+
+	* search.c (Freplace_match): Remove unused variable `inslen'.
+
+	* keymap.c (access_keymap): Remove unused variables `c1' and `c2'.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c (x_window_to_frame): Remove irrelevant TODO comment.
+	(w32_wnd_proc) <WM_MENUSELECT>: Show help echo directly.
+	(my_create_tip_window): New function.
+	(x_create_tip_frame, compute_tip_xy): Adapt for Windows.
+	(Fx_show_tip, Fx_hide_tip) [TEST_TOOLTIPS]: Adapt for Windows.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* coding.h (Vw32_system_coding_system) [WINDOWSNT]: Remove.
+	(ENCODE_SYSTEM, DECODE_SYSTEM) [WINDOWSNT]: Use Vlocale_coding_system.
+
+	* w32fns.c (Vw32_system_coding_system): Remove.
+	(w32_to_x_font, x_to_w32_font): Use Vlocale_coding_system.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Move choose_write_coding_system to
+	after build_annotations.
+
+	* syntax.c (describe_syntax): Add dummy arg.
+	(describe_syntax_1): Update call to describe_vector.
+
+	* category.c (describe_category): Add dummy arg.
+	(describe_category_1): Update call to describe_vector.
+
+	* keymap.c (Fdescribe_vector): Add `describer' parameter.
+	(describe_command, describe_translation): Add dummy second param.
+	(describe_map): Call elt_describer with two arguments.
+	(describe_vector_princ): Add `fun' parameter.
+	Call it instead of the hardcoded `princ'.
+	(describe_vector): Add arg `args'.
+	Pass it as a new second argument to elt_describer.
+
+	* keymap.h (describe_vector): Update prototype.
+
+	* frame.c: Don't include keymap.h any more.
+	(keys_of_frame): Remove.
+
+	* lisp.h (keys_of_frame): Remove declaration.
+
+	* emacs.c (main): Don't call `keys_of_frame' any more.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* unexelf.c [!defined MAP_ANON]: Define MAP_ANON to MAP_ANONYMOUS
+	if defined, 0 otherwise.
+	(MAP_FAILED): Define if not defined and use it to test mmap failure.
+	(unexec) [!MAP_ANON]: Use /dev/zero as file to map.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* indent.c (current_column_1): Fix handling of scan_bytes for mb chars.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (note_mouse_highlight): Fix type of variable `ignore'.
+	(x_draw_bar_cursor): If the background color of the glyph under
+	the cursor equals the frame's cursor color, use the glyph's
+	foreground color for drawing the bar cursor.
+	(x_after_update_window_line): Clear internal border in different
+	circumstances.
+	(w32_set_vertical_scroll_bar): Check for width and height > 0.
+	(w32_draw_relief_rect): Correct relief by 1 pixel.
+	(x_set_glyph_string_background_width):
+	Set extends_to_end_of_line_p if the row's fill_line_p is set and
+	drawing the last glyph with DRAW_IMAGE_{RAISED,SUNKEN}.
+	(x_display_and_set_cursor): If cursor_in_echo_area, use NO_CURSOR
+	if cursor_in_non_selected_windows is false.
+	(show_mouse_face): Clean up.  Recognize overwritten cursor differently.
+	(x_draw_glyphs): Remove parameters REAL_START and REAL_END.
+	Notice if cursor gets overwritten.
+	(notice_overwritten_cursor): Renamed from
+	note_overwritten_text_cursor.  Rewritten to take glyph widths
+	into account, and to take X positions as parameters.
+	(x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p
+	around call to x_draw_glyphs.
+	(x_setup_relief_colors): Use `IMAGE_BACKGROUND' and
+	`IMAGE_BACKGROUND_TRANSPARENT' to calculate the correct background
+	color to use for image glyph reliefs.
+	(x_draw_image_relief): Accept zero tool_bar_button_relief.
+	(glyph_rect): Remove unused variable `area'.
+
+	* w32fns.c (x_set_frame_parameters): Avoid infinite recursion for
+	some items.
+	(x_set_internal_border_width): Set frame garbaged when window
+	doesn't exist yet.
+	(Fx_create_frame): Accept zero tool_bar_button_relief.
+	(x_clear_image_1, four_corners_best, image_background)
+	(image_background_transparent): New functions.
+	(xpm_format, png_format, jpeg_format, tiff_format, gif_format)
+	(gs_format): Add `:background' entry.
+	(lookup_image): Set IMG's background color if specified.
+	(pbm_load, xbm_load_image, png_load): Set IMG's background field
+	when appropriate.
+	(x_clear_image_1): Reset `background_valid' and
+	`background_transparent_valid' fields.
+	(x_build_heuristic_mask): Use IMAGE_BACKGROUND instead of
+	calculating it here.  Set IMG's background_transparent field.
+	(enum xpm_keyword_index): Add XPM_BACKGROUND.
+	(enum png_keyword_index): Add PNG_BACKGROUND.
+	(enum jpeg_keyword_index): Add JPEG_BACKGROUND.
+	(enum tiff_keyword_index): Add TIFF_BACKGROUND.
+	(enum gif_keyword_index): Add GIF_BACKGROUND.
+	(enum gs_keyword_index): Add GS_BACKGROUND.
+	(pbm_load, png_load, jpeg_load, tiff_load, gif_load):
+	Pre-calculate image background color where necessary.
+	(x_create_x_image_and_pixmap, xbm_load, gs_load):
+	Use display info's n_cbits entry for screen depth.
+	(Fx_show_tip): Remove unused variables `buffer', `top',
+	`left', `max_width' and `max_height'.
+
+	* w32menu.c (w32_menu_show, push_menu_pane): Doc fixes.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* puresize.h (BASE_PURESIZE): Increase to 750000.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* frame.c (Fframe_live_p): Doc fix.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xdisp.c (message_dolog_marker1, message_dolog_marker2)
+	(message_dolog_marker3): New static variables hold three markers.
+	(syms_of_xdisp): Initialize and staticpro them.
+	(message_dolog): Use message_dolog_marker1..3 instead of
+	allocating markers each time.  Unchain them when done.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* doc.c (Fsnarf_documentation): Doc fix.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* xterm.c (note_mouse_highlight): Fix type of variable `ignore'.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Avoid initializer for Lisp_Object.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* xterm.c (notice_overwritten_cursor): Take care of end < 0 case.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xdisp.c (tool_bar_item_info): Avoid calling Fget_text_property
+	with invalid position.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* syswait.h: Delete conditionals for HPUX7, ISC 4.1, and convex.
+
+	* s/isc4-1.h (HAVE_SYS_WAIT_H): Add #undef.
+	* s/hpux.h (HAVE_SYS_WAIT_H): Add #undef.
+	* s/hpux8.h (HAVE_SYS_WAIT_H): Define it.
+
+	* m/convex.h (HAVE_SYS_WAIT_H): Add #undef.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (build_annotations): Split off the tail.
+	(build_annotations_2): New fun.  Extracted from build_annotations.
+	(Fwrite_region): Split the call to build_annotations into two
+	calls to build_annotations and build_annotations_2.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* sysdep.c (wait_for_kbd_input) [VMS]: Do not call
+	clear_waiting_for_input with argument.
+
+	* xterm.h (x_update_cursor): Remove duplicated prototype.
+
+	* keyboard.h (clear_waiting_for_input): Remove duplicated prototype.
+
+	* xterm.c (waiting_for_input): Remove unnecessary declaration.
+
+	* data.c (Ftimes, Fquo, Frem, Fmod): Doc fix.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* fileio.c (choose_write_coding_system): New fun, extracted
+	from Fwrite_region.
+	(Fwrite_region): Use it.
+
+	* eval.c (max_specpdl_size, max_lisp_eval_depth): Use EMACS_INT.
+	(funcall_lambda, run_hook_with_args): Make static and add prototype.
+	(ml_apply, find_handler_clause): Add prototype.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* config.in: Add #undef HAVE_COFF_H.
+
+	* unexec.c (coff.h): Don't include unless HAVE_COFF_H is defined.
+	Required for ISC 4.1.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* syswait.h: (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
+	Andrew Wiseman <[e-mail]>.
+
[phone]  Kim F. Storm  <[e-mail]>
+
+	The following changes are made to clean up the various internal
+	references to the fringes to actually use the term `fringe' for
+	them.  Previously, they were called `flags areas', `bitmap areas',
+	`left/right side of windows', or implicitly as `flags' or
+	`bitmaps':
+
+	* dispextern.h (FRINGE_FACE_ID): Renamed from BITMAP_AREA_FACE_ID.
+	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.
+	(FRAME_LEFT_FRINGE_WIDTH): Renamed from FRAME_LEFT_FLAGS_AREA_WIDTH.
+
+	* msdos.c: Comment fix.
+
+	* w32fns.c: 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.
+	(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.
+	(FRAME_X_FRINGE_COLS): Renamed from FRAME_X_FLAGS_AREA_COLS.
+	(FRAME_X_FRINGE_WIDTH): Renamed from FRAME_X_FLAGS_AREA_WIDTH.
+	(FRAME_X_LEFT_FRINGE_WIDTH):
+	Renamed from FRAME_X_LEFT_FLAGS_AREA_WIDTH.
+	(FRAME_X_RIGHT_FRINGE_WIDTH):
+	Renamed from FRAME_X_RIGHT_FLAGS_AREA_WIDTH.
+
+	* widget.c: Use renamed symbols.
+
+	* window.c: Comment fixes. Use renamed symbols.
+	(coordinates-in-window-p): Doc fix.
+
+	* 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.
+	(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.
+	(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.
+	(FRAME_X_FRINGE_COLS): Renamed from FRAME_X_FLAGS_AREA_COLS.
+	(FRAME_X_FRINGE_WIDTH): Renamed from FRAME_X_FLAGS_AREA_WIDTH.
+	(FRAME_X_LEFT_FRINGE_WIDTH):
+	Renamed from FRAME_X_LEFT_FLAGS_AREA_WIDTH.
+	(FRAME_X_RIGHT_FRINGE_WIDTH):
+	Renamed from FRAME_X_RIGHT_FLAGS_AREA_WIDTH.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (add-menu-item): Make help_echo and radio buttons
+	work for most menu items.  From David Ponce
+	<[e-mail]>.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* xfns.c (x_set_frame_parameters): Revert change of 2001-11-07.
+	Some x_set_* function expect to be called even if old and new
+	value are equal.
+
+	* xdisp.c (build_desired_tool_bar_string): Accept zero
+	tool_bar_button_relief.
+
+	* xfns.c (Fx_create_frame): Accept zero tool_bar_button_relief.
+
+	* xterm.c (x_draw_image_relief): Accept zero tool_bar_button_relief.
+
+	* xterm.c (x_draw_bar_cursor): If the background color of the
+	glyph under the cursor equals the frame's cursor color, use
+	the glyph's foreground color for drawing the bar cursor.
+
+	* dispnew.c (direct_output_forward_char): Fix character/byte
+	position comparison.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* editfns.c (find_field): Add BEG_LIMIT and END_LIMIT parameters.
+	(Fdelete_field, Ffield_string, Ffield_string_no_properties):
+	Update arguments to find_field.
+	(Ffield_beginning, Ffield_end): Add LIMIT param, pass to find_field.
+	(Fconstrain_to_field): Use LIMIT arg to shorten search time.
+	* lisp.h (Ffield_beginning, Ffield_end): Update EXFUN decl.
+	* minibuf.c (Fminibuffer_prompt_end): Update args to Ffield_end.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* editfns.c (Fpropertize): Allow call with 1 arg.
+
+	* dispextern.h (image_background, image_background_transparent):
+	Conditionalize on HAVE_X_WINDOWS.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* print.c (Fprin1_to_string): Doc fix.
+
+	* sunfns.c (Fsun_change_cursor_icon): Doc fix.
+
+	* floatfns.c (Fceiling, Ffloor): Doc fixes.
+
+	* filelock.c (Funlock_buffer, Ffile_locked_p): Doc fixes.
+
+	* fileio.c (Ffile_accessible_directory_p): Doc fix.
+
+	* eval.c (syms_of_eval): Doc fix.
+
+	* coding.c (syms_of_coding): Doc fix.
+
+	* doc.c (Fsnarf_documentation): Doc fix.
+
+	* dispnew.c (syms_of_display): Doc fix.
+
+	* category.c (Fget_unused_category): Doc fix.
+
+	* buffer.c (syms_of_buffer): Doc fixes.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* print.c (prin1, print): Doc fix.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* fontset.h: Remove declarations of variables
+	`Vhighlight_wrong_size_font' and `Vclip_large_size_font'.
+
+	* fontset.c: Remove variables `Vhighlight_wrong_size_font' and
+	`Vclip_large_size_font'.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32fns.c: Doc fix.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xfaces.c (Fface_attributes_as_vector): Doc fix.
+
+	* fns.c: Doc fix.
+
+	* emacs.c: Doc fix.
+
+	* coding.c: Doc fix.
+
+	* cmds.c, composite.c, dired.c, doc.c, filelock.c, floatfns.c,
+	* fontset.c, insdel.c, keymap.c: Change doc-string comments to
+	`new style' [w/`doc:' keyword].
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xterm.c (XTread_socket): Don't update focus for EnterNotify or
+	LeaveNotify events.  Only FocusIn and FocusOut do that now.
+	(x_display_and_set_cursor): Do display hollow cursors in active
+	minibuffer windows when they are not selected.
+
[phone]  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.
+
+	* w32fns.c: Don't define max.
+	(Fx_open_connection): Only execute once.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* ccl.c: Change macros to use do-while block instead of if-else.
+	Use braces to follow GNU Coding Standards.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* sysdep.c (child_setup_tty): Don't clear ICRNL or INLCR.
+
+	* lread.c (read_escape): Use end_of_file_error for reporting eof.
+
+	* 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.
+
+	* textprop.c (set_text_properties_1): New subroutine
+	broken out of set_text_properties.
+	(set_text_properties): Use set_text_properties_1.
+
+	* intervals.c (graft_intervals_into_buffer):
+	Use set_text_properties_1 to clear out properties.
+
+	* search.c (Freplace_match): Use replace_range to insert
+	and delete.  Don't request property inheritance from
+	surrounding text.
+
[phone]  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.
+	Do not give up if we find a font that cannot be converted to an xlfd.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* unexelf.c (unexec): Use mmap/munmap to allocate buffers
+	instead of malloc/free.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xfaces.c (merge_face_vectors): Use braces to follow GNU
+	Coding Standards.
+	(Finternal_set_lisp_face_attribute): Likewise.
+
+	* buffer.c (Fbury_buffer): Likewise.
+
+	* indent.c (current_column_1): Remove unused variable `prev_col'.
+
+	* coding.c (encode_coding): Use precomputed value of `src'.
+	(encode_coding): Remove unused variable `src_end'.
+	(code_convert_region): Remove unused variables `count'.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32term.c (x_display_and_set_cursor): Do not move system caret
+	if cursor_glyph is NULL.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* keymap.c (access_keymap): Fix compilation error.
+
[phone]  Miles Bader  <[e-mail]>
+
+	* xfns.c (x_set_frame_parameters): Avoid infinite recursion.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* intervals.c (graft_intervals_into_buffer):
+	Remove #ifdef'd-out code.
+	(graft_intervals_into_buffer): Remove unused variable `middle'.
+
+	* lread.c (Feval_region): Remove obsolete #ifdef'd-out
+	code (eval-current-buffer).
+	Change doc-string comments to `new style' [w/`doc:' keyword].
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (access_keymap): Don't use initializers on Lisp_Object.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* lread.c (read1): Fix behavior with nested backquoting.
+
+	* keyboard.c (make_lispy_event): Check integerness and fix
+	Lisp_Object/int mixup.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* fns.c (copy_hash_table): Remove unused variable `v'.
+
+	* fontset.c (fontset_font_pattern): Remove unused variable
+	`family_registry'.
+
+	* indent.c (current_column_1): Remove unused variable `prev_col'.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* m/news-risc.h (BROKEN_PROTOTYPES): Defined.
+
+	* buffer.c (Fkill_buffer): Don't delete auto save file
+	if buffer is modified.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32proc.c (Fw32_set_keyboard_layout): Use CHECK_NUMBER_CAR and
+	CHECK_NUMBER_CDR.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* unexelf.c (unexec): Minor changes; clean up comments.
+
[phone]  Sam Steingold  <[e-mail]>
+
+	* w32term.c (x_display_and_set_cursor): Fix w32 compilation error.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* sound.c (sound_perror): Save errno from being clobbered.
+
[phone]  Dale Hagglund  <[e-mail]>
+
+	* unexelf.c (unexec): Don't use `mmap'.  Instead, read and write
+	the program image directly.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* buffer.h (Fbuffer_local_value): Add prototype.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* buffer.c (Fbuffer_local_value): Remove extra args from CHECK_SYMBOL
+	and CHECK_BUFFER.
+
+	* keyboard.c (read_char): Use Fcar and Fcdr, not Fnth.
+	(record_char): Likewise.
+
+	* keyboard.c (make_lispy_event): Don't insist a drag event must
+	move to a different buffer position.  Instead, check for moving at
+	least double_click_fuzz.
+
+	* fns.c (Fmake_hash_table): Use XCAR and XCDR, not Fnth and Flength.
+
+	* keyboard.c (echo-area-clear-hook): Undo Oct 29 change.
+
+	* indent.c (current_column_1, Fmove_to_column): Separate the code
+	for display-table glyphs from the code for buffer text, to fix
+	bugs in the former.
+
[phone]  Michael Welsh Duggan  <[e-mail]>
+
+	* buffer.c (Fbuffer_local_value): New function.
+	(syms_of_buffer): Defsubr it.
+
+	* xterm.c, w32term.c (x_display_and_set_cursor): Use buffer-local
+	value of `cursor-in-non-selected-windows'.
+
+	* lisp.h (Qcursor_in_non_selected_windows): New declaration.
+	* xdisp.c (Qcursor_in_non_selected_windows): New variable.
+	(syms_of_xdisp): Initialize it.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* xfns.c (Fx_create_frame): Doc fix.
+
+	* coding.c: Change doc-string comments to `new style' [w/`doc:'
+	keyword].
+
+	* eval.c (top_level_value, top_level_set): Remove commented and
+	#ifdef'd-out code.
+	(Fdefvar): Fix usage in doc-string.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* xfns.c: Include unistd.h, if it exists.
+
+	* editfns.c: Move the include of ctype.h after unistd.h.
+
+	* gmalloc.c: Test BROKEN_PROTOTYPES.
+
[phone]  Ken Raeburn  <[e-mail]>
+
+	* lisp.h (CHECK_STRING_CAR): New macro.
+	* lread.c (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of
+	treating XCAR and XCDR as lvalues.
+	(openp): Use CHECK_STRING_CAR.
+	(read_list): Use XSETCDR instead of treating XCDR as lvalue.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* s/sco5.h (sigprocmask_set): Declare as extern SIGMASKTYPE.
+	(SIGMASKTYPE): Define.
+
+	* syssignal.h (sigunblock): Don't define if already defined.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* eval.c (debugger_may_continue, Vdebug_ignored_errors)
+	(call_debugger, Fcondition_case, skip_debugger, unbind_to):
+	Fix typos in comments.
+
+	* mocklisp.c (Fml_defun, Fml_while, Fml_substr): Remove commented
+	and #ifdef'd-out code.
+	Fix and reindent comments.
+
+	* mocklisp.h: Remove comment which is a copy of comment in mocklisp.c.
+
+	* category.h (CHECK_CATEGORY, CHECK_CATEGORY_SET): Remove unused
+	argument `i' in macros.
+
+	* frame.h (CHECK_FRAME, CHECK_LIVE_FRAME): Remove unused argument
+	`i' in macros.
+
+	* lisp.h (CHECK_STRING_OR_BUFFER, CHECK_HASH_TABLE, CHECK_LIST)
+	(CHECK_STRING, CHECK_CONS, CHECK_SYMBOL, CHECK_CHAR_TABLE)
+	(CHECK_VECTOR, CHECK_VECTOR_OR_CHAR_TABLE, CHECK_BUFFER)
+	(CHECK_WINDOW, CHECK_LIVE_WINDOW, CHECK_PROCESS, CHECK_NUMBER)
+	(CHECK_NATNUM, CHECK_MARKER, CHECK_NUMBER_COERCE_MARKER)
+	(CHECK_FLOAT, CHECK_NUMBER_OR_FLOAT)
+	(CHECK_NUMBER_OR_FLOAT_COERCE_MARKER, CHECK_OVERLAY)
+	(CHECK_NUMBER_CAR, CHECK_NUMBER_CDR): Remove unused argument `i'
+	in macros.
+
+	* abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c,
+	* casefiddle.c, category.c, ccl.c, charset.c, cmds.c, coding.c,
+	* composite.c, data.c, dired.c, dispnew.c, doc.c, dosfns.c, emacs.c,
+	* eval.c, fileio.c, filelock.c, fns.c, fontset.c, frame.c, frame.h,
+	* indent.c, keyboard.c, keymap.c, lread.c, macros.c, marker.c,
+	* minibuf.c, mocklisp.c, msdos.c, print.c, process.c, search.c,
+	* sunfns.c, syntax.c, textprop.c, undo.c, w16select.c, w32console.c,
+	* w32fns.c, w32menu.c, w32proc.c, w32select.c, window.c, xdisp.c,
+	* xfaces.c, xmenu.c, xselect.c: Update usage of CHECK_ macros
+	(remove unused second argument).
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* syntax.c (describe_syntax): New wrapper.
+	(Finternal_describe_syntax_value): Rename from describe_syntax.
+	Don't insert space at front and \n at the end.
+	(syms_of_syntax): Defsubr Sinternal_describe_syntax_value.
+
+	* regex.c (re_wctype): Try to fix some warnings.
+	(regcomp, regexec): Don't forget the __restrict.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* textprop.c (Fget_char_property): Doc fix.
+
[phone]  Pavel Jan,Am(Bk  <[e-mail]>
+
+	* process.c (Fstart_process): Add usage to doc-string.
+
+	* data.c (Fsetq_default): Ditto.
+
+	* callint.c (Finteractive): Ditto.
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* macros.c: Don't include keymap.h any more.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* data.c (Fmake_local_variable): Doc fix.
+
+	* eval.c (Frun_hooks, Frun_hook_with_args_until_failure): Doc fix.
+	(Frun_hook_with_args_until_success, Frun_hook_with_args): Doc fix.
+
+	* keymap.c (Fdescribe_buffer_bindings): Print character property
 	bindings along with or instead of the buffer local map.
 	Make the overriding maps override what they should.