changeset 85130:3ef195e61c94

Revert accidental change during the merge from emacs--rel--22.

--- a/src/ChangeLog.10	Wed Oct 10 08:53:30 2007 +0000
+++ b/src/ChangeLog.10	Wed Oct 10 09:12:01 2007 +0000
@@ -1,391 +1,4 @@
-<<<<<<< TREE
 2007-04-24  Chong Yidong  <[e-mail]>
-=======
-2007-10-06  Martin Rudalics  <[e-mail]>
-
-	* keyboard.c (kbd_buffer_get_event): Break loop waiting for input
-	when there's an unread command event.
-
-	* frame.c (focus_follows_mouse): Moved here from frame.el to allow
-	window autoselection act appropriately when leaving selected frame.
-	(syms_of_frame): Initialize focus_follows_mouse.
-	* frame.h (focus_follows_mouse): Extern it.
-	* macterm.c (XTread_socket): When focus_follows_mouse is nil
-	make SELECT_WINDOW_EVENT only if we don't leave the selected
-	frame.
-	* msdos.c (dos_rawgetc): Likewise.
-	* w32term.c (w32_read_socket): Likewise.
-	* xterm.c (handle_one_xevent): Likewise.
-	* xdisp.c (syms_of_xdisp): In doc-string of
-	mouse-autoselect-window mention focus-follows-mouse.
-
-2007-10-06  Andreas Schwab  <[e-mail]>
-
-	* fileio.c (Fwrite_region): Ignore EINVAL error from fsync.
-
-2007-10-05  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* macterm.c (mac_load_query_font): Fix missing return value.
-	[USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap):
-	Add BLOCK_INPUT.
-
-2007-10-04  Juanma Barranquero  <[e-mail]>
-
-	* image.c (syms_of_image) <image-types>: Fix typo in docstring.
-
-2007-10-02  Richard Stallman  <[e-mail]>
-
-	* xdisp.c (get_window_cursor_type): Implement documented behavior
-	for cursor-in-non-selected-windows = t.
-
-2007-10-01  Juanma Barranquero  <[e-mail]>
-
-       * lread.c (Fload): Fix typo in docstring.
-
-2007-09-29  Juri Linkov  <[e-mail]>
-
-	* emacs.c (standard_args): Change priority of "--no-splash"
-	from 40 to 3.  Add "--no-desktop" with the same priority.
-
-2007-09-29  Jason Rumney  <[e-mail]>
-
-	* w32.c (w32_get_resource): Always close registry keys.
-
-2007-09-27  Jason Rumney  <[e-mail]>
-
-	* makefile.w32-in (LIBS): Add COMCTL32.
-
-	* w32fns.c (globals_of_w32fns): Init common controls.
-
-2007-09-21  Richard Stallman  <[e-mail]>
-
-	* image.c (our_memory_buffer): Renamed from omfib_buffer.
-
-2007-09-21  Juanma Barranquero  <[e-mail]>
-
-	* w32term.c (x_draw_glyph_string): Use strike_through_color, not
-	underline_color, to draw strike-through.
-
-2007-09-20  Glenn Morris  <[e-mail]>
-
-	* process.c (Fmake_network_process): Doc fix.
-
-2007-09-19  Richard Stallman  <[e-mail]>
-
-	* buffer.c (Foverlays_at): Doc fix.
-
-2007-09-18  Stefan Monnier  <[e-mail]>
-
-	* fns.c (Fplist_put): Preserve uneven tail data.
-
-2007-09-16  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* gtkutil.c (xg_get_image_for_pixmap): Always create a GdkPixbuf
-	when we have no file name for the icon.
-	(xg_tool_bar_expose_callback): Remove.
-	(xg_create_tool_bar): Don't connect expose signal to
-	xg_tool_bar_expose_callback.
-
-2007-09-16  Andreas Schwab  <[e-mail]>
-
-	* alloc.c (reset_malloc_hooks): Set the hooks to the previous
-	values instead of zapping them.
-
-2007-09-15  Glenn Morris  <[e-mail]>
-
-	* s/hpux.h: No longer define `static' as nothing.
-
-2007-09-14  Glenn Morris  <[e-mail]>
-
-	* fringe.c (init_fringe_bitmap) <swap nibble>: Move to file scope.
-	* gtkutil.c (xg_separator_p) <separator_names>: Move to file scope.
-	* image.c (our_memory_fill_input_buffer) <buffer>: Move to file
-	scope and rename to omfib_buffer for clarity.
-	(gif_load) <interlace_start, interlace_increment>: Move to file scope.
-
-2007-09-14  Peter O'Gorman  <[e-mail]>  (tiny change)
-
-	* gtkutil.c (xg_get_file_with_chooser): Move GCPRO1 after declarations.
-
-	* termhooks.h (enum event_kind): Remove trailing comma.
-
-	* frame.h (enum): Remove trailing comma.
-
-2007-09-14  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* keyboard.c, xterm.c, xfaces.c (abs): #undef before #define.
-
-2007-09-12  Glenn Morris  <[e-mail]>
-
-	* gtkutil.c (cnt): Rename to menu_grab_callback_cnt for clarity.
-	(menu_grab_callback): All uses changed.
-
-	* xselect.c (cnt): Rename to x_reply_selection_request_cnt for clarity.
-	(x_reply_selection_request): All uses changed.
-
-2007-09-06  Pixel  <[e-mail]>  (tiny change)
-
-	* image.c (gif_load): Fix bug: Handle nonexistent colormap.
-
-2007-09-06  Glenn Morris  <[e-mail]>
-
-	* gtkutil.c (menu_grab_callback) <cnt>:
-	* xselect.c (x_reply_selection_request) <cnt>: Move static
-	variable to file scope.
-
-2007-09-02  Dhuvra Krishnamurthy  <[e-mail]>  (tiny change)
-
-	* w32proc.c (delete_child): Don't terminate threads of zombies.
-
-2007-09-02  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* keyboard.c: Qrtl is new.
-	(parse_tool_bar_item): Handle :rtl keyword.
-	(syms_of_keyboard): Intern :rtl keyword.
-
-	* dispextern.h (enum tool_bar_item_idx): Add TOOL_BAR_ITEM_RTL_IMAGE.
-
-	* gtkutil.c (file_for_image, find_rtl_image): New functions.
-	(xg_get_image_for_pixmap): Use file_for_image
-	(update_frame_tool_bar): If direction is RTL, use RTL image if
-	defined.  Use Gtk stock images or named theme icons if defined.
-
-2007-08-29  Martin Rudalics  <[e-mail]>
-
-	* keyboard.h (struct kboard): New elt Vlast_repeatable_command.
-
-	* keyboard.c (syms_of_keyboard): Set up new Lisp variable
-	last-repeatable-command.
-	(init_kboard): Initialize Vlast_repeatable_command.
-	(command_loop_1): Set it to real_this_command unless that was
-	bound to an input event.
-	(mark_kboards): Mark it.
-
-2007-08-28  Juanma Barranquero  <[e-mail]>
-
-	* image.c (syms_of_image) <image-library-alist, cross-disabled-images>:
-	Doc fixes.
-
-2007-08-28  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
-	so no Lisp code is executed.
-
-2007-08-27  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* macterm.c (x_draw_composite_glyph_string_foreground): Draw rectangle
-	for nonexistent or zero-width glyph in composition glyph.
-
-2007-08-27  Richard Stallman  <[e-mail]>
-
-	* eval.c (condition-case): Doc fix.
-
-2007-08-27  Masatake YAMATO  <[e-mail]>
-
-	* xfaces.c (tty_supports_face_attributes_p): Fix code
-	for LFACE_INVERSE_INDEX and LFACE_BACKGROUND_INDEX; code
-	was copied and not edited.
-
-2007-08-23  Stefan Monnier  <[e-mail]>
-
-	* lread.c (load_warn_old_style_backquotes): Fix up array size typo.
-
-2007-08-22  Stefan Monnier  <[e-mail]>
-
-	* lread.c (Qold_style_backquotes): New var.
-	(syms_of_lread): Init and staticpro it.
-	(load_warn_old_style_backquotes): New fun.
-	(Fload): Use them to warn about old style backquotes.
-	(end_of_file_error, Fload): Remove unused vars.
-
-	* lisp.h (Fclear_face_cache, Fx_send_client_event): Declare.
-
-	* lread.c (Vold_style_backquotes): New var.
-	(syms_of_lread): Init and export it to Elisp.
-	(read1): Set it when we find an old-style (back)quote.
-
-2007-08-22  Jason Rumney  <[e-mail]>
-
-	* w32reg.c (SYSTEM_DEFAULT_RESOURCES): Add missing NULL terminator.
-
-2007-08-21  Stefan Monnier  <[e-mail]>
-
-	* insdel.c (reset_var_on_error): New fun.
-	(signal_before_change, signal_after_change):
-	Use it to reset (after|before)-change-functions to nil in case of error.
-	Bind inhibit-modification-hooks to t.
-	Don't bind (after|before)-change-functions to nil while they run.
-
-2007-08-19  Andreas Schwab  <[e-mail]>
-
-	* alloc.c (pure): Round PURESIZE up.
-
-2007-08-17  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* xterm.c (handle_one_xevent): Remove check that mouse click is in
-	active frame.
-
-2007-08-15  Philippe Waroquiers  <[e-mail]>
-
-	* term.c (tty_default_color_capabilities): Declare static
-	variables in file scope, to avoid HPUX compiler problem.
-
-2007-08-13  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* gtkutil.c (update_frame_tool_bar): Use -1 as index
-	to gtk_toolbar_insert.
-
-2007-08-11  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* xterm.c (x_draw_image_glyph_string): Adjust stipple origin when
-	filling pixmap with stippled background.
-
-2007-08-10  Stefan Monnier  <[e-mail]>
-
-	* print.c (new_backquote_output): Rename from old_backquote_output.
-	(print): Inverse its logic (according to its name) so as to match the
-	behavior of new_backquote_flag in lread.c.
-
-2007-08-09  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* gmalloc.c (posix_memalign): New function.
-
-2007-08-08  Glenn Morris  <[e-mail]>
-
-	* Replace `iff' in doc-strings and comments.
-
-2007-08-07  Chong Yidong  <[e-mail]>
-
-	* dispextern.h (struct image): New members.
-
-	* image.c: Sync to trunk version.
-	(search_image_cache, uncache_image, image-refresh): New functions.
-	Check for fg and bg colors.
-	(lookup_image): Use search_image_cache.  Cache fg and bg colors.
-	(pbm_load): Another check for invalid image data.
-	(png_load): Ignore default background field.
-
-	* xdisp.c (move_it_by_lines): Remove incorrect optimization.
-
-2007-08-07  Jan Dj,Ad(Brv  <[e-mail]>
-
-	* gmalloc.c (__malloc_initialize): Remove pthread_once.  Not needed.
-
-2007-08-07  Sam Steingold  <[e-mail]>
-
-	* gmalloc.c (__morecore): Fix the declaration to comply with the
-	definition.
-
-2007-08-07  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* emacs.c (main)
-	[HAVE_GTK_AND_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
-	Call malloc_enable_thread on interactive startup.
-
-	* gmalloc.c (_malloc_thread_enabled_p) [USE_PTHREAD]: New variable.
-	(LOCK, UNLOCK, LOCK_ALIGNED_BLOCKS, UNLOCK_ALIGNED_BLOCKS)
-	[USE_PTHREAD]: Conditionalize with it.
-	(malloc_atfork_handler_prepare, malloc_atfork_handler_parent)
-	(malloc_atfork_handler_child, malloc_enable_thread) [USE_PTHREAD]:
-	New functions.
-
-2007-08-06  Chong Yidong  <[e-mail]>
-
-	* xdisp.c (redisplay_window): When restoring original buffer
-	position, make sure it is still valid.
-
-2007-08-06  Martin Rudalics  <[e-mail]>
-
-	* window.c (window_min_size_2): New function.
-	(window_min_size_1, size_window, Fdisplay_buffer)
-	(Fsplit_window, adjust_window_trailing_edge): Use it to avoid
-	windows without mode- or header-lines when window-min-height is
-	too small.
-	(size_window): Reset nodelete_p after testing it, following an
-	earlier note by Kim F. Storm.
-	(display_buffer): Do not set split_height_threshold to twice the
-	value of window_min_height to avoid changing the value of a
-	customizable variable.  Rather explicitly check whether the
-	height of the window that shall be splitted is at least as large
-	as split_height_threshold.
-	(Fwindow_full_width_p): New defun.
-	(syms_of_window): Defsubr it.
-
-	* window.h: Add EXFUN for Fwindow_full_width_p.
-
-2007-08-06  Andreas Schwab  <[e-mail]>
-
-	* window.c (Fdisplay_buffer): Use NILP.
-	(Fset_window_scroll_bars): Likewise.
-
-2007-08-03  Richard Stallman  <[e-mail]>
-
-	* fileio.c (Fvisited_file_modtime): Use make_time.
-
-2007-08-01  Ryo Yoshitake  <[e-mail]>  (tiny change)
-
-	* mac.c (init_mac_osx_environment): Adjust load-path on self-contained
-	build.
-
-2007-07-30  Stefan Monnier  <[e-mail]>
-
-	* eval.c (init_eval_once): Bump max_lisp_eval_depth to 400.
-
-2007-07-25  Glenn Morris  <[e-mail]>
-
-	* Relicense all FSF files to GPLv3 or later.
-
-	* COPYING: Switch to GPLv3.
-
-2007-07-24  Jason Rumney  <[e-mail]>
-
-	* w32fns.c (x_real_positions): Get real position from OS instead of
-	calculating it.
-
-2007-07-23  Jason Rumney  <[e-mail]>
-
-	* filelock.c (current_lock_owner): Allow for @ sign in username.
-
-2007-07-20  Eli Zaretskii  <[e-mail]>
-
-	* makefile.w32-in (clean): Don't delete *~.
-
-	* w32proc.c (IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32):
-	Define if not defined.
-
-2007-07-18  Jason Rumney  <[e-mail]>
-
-	* w32proc.c (w32_executable_type): Handle 64 bit executables.
-
-2007-07-16  Juanma Barranquero  <[e-mail]>
-
-	* coding.c (Ffind_operation_coding_system):
-	* eval.c (For, Fand, Fprogn):
-	* keyboard.c (Ftrack_mouse):
-	* print.c (Fwith_output_to_temp_buffer):
-	* window.c (Fsave_window_excursion): Doc fixes (some reported
-	by Johan Bockg,Ae(Brd).
-
-2007-07-15  Richard Stallman  <[e-mail]>
-
-	* data.c (Fsetq_default): Doc fix.
-
-	* eval.c (Fsetq): Doc fix.
-
-2007-07-11  Jason Rumney  <[e-mail]>
-
-	* makefile.w32-in (LIBS): Include OLE32.
-
-	* w32fns.c (w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
-	(w32_msg_pump) <WM_DESTROY>: Uninitialize COM.
-
-2007-06-28  YAMAMOTO Mitsuharu  <[e-mail]>
-
-	* macterm.c [USE_MAC_TSM] (mac_handle_text_input_event):
-	Check WINDOWP before using XWINDOW.
-
-2007-06-27  Juanma Barranquero  <[e-mail]>
->>>>>>> MERGE-SOURCE
 
 	* Branch for 22.1.