(Fw32_set_clipboard_data): Get sequence number after closing the clipboard.
[bpt/emacs.git] / src / ChangeLog
index 95cec4f..babc20c 100644 (file)
@@ -1,3 +1,501 @@
+2004-04-18  Jason Rumney  <jasonr@gnu.org>
+
+       * w32select.c (Fw32_set_clipboard_data): Get sequence number
+       after closing the clipboard.
+
+2004-04-16  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * buffer.c (Fbuffer_base_buffer): Doc fix.
+
+2004-04-17  Kim F. Storm  <storm@cua.dk>
+
+       * keymap.c (Fkey_description): Add optional PREFIX arg.
+       Combine prefix with KEYS to make up the full key sequence to describe.
+       Correlate meta_prefix_char and following (simple) key to describe
+       as meta modifier.  All callers changed.
+       (describe_map): Rename arg `keys' to `prefix'.  Remove local
+       `elt_prefix' var.  Use Fkey_description with prefix instead of
+       elt_prefix combined with Fsingle_key_description.
+       (describe_vector): Declare static.  Replace arg `elt_prefix' with
+       `prefix'.  Add KEYMAP_P arg.  Add local var `elt_prefix'; use it
+       if !KEYMAP_P. Use Fkey_description with prefix instead of
+       Fsingle_key_description.
+
+       * keymap.h (Fkey_description): Fix prototype.
+       (describe_vector): Remove prototype.
+
+       * xdisp.c (update_overlay_arrows): Fix handling of up_to_date < 0.
+
+       * image.c (PNG_BG_COLOR_SHIFT): Remove.
+       (png_load): Fix calculation of transparent background color on X
+       and W32 platforms.
+
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+       * xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+       not too large before computing how much to scroll.
+
+2004-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dired.c (Ffile_attributes): Don't pass extra nil arg to file-handler.
+
+2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):
+       Add hyperlink to Elisp manual to the docstring.
+
+2004-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * callint.c (fix_command): Use XDCR.
+
+2004-04-14  Nick Roberts  <nick@nick.uklinux.net>
+
+       * window.c (Fget_lru_window): Doc fix.
+
+2004-04-14  Kim F. Storm  <storm@cua.dk>
+
+       * editfns.c (Fformat): Fix allocation size of precision array.
+
+       * dispnew.c (update_window): Only set changed_p if
+       scrolling_window actually did scroll.
+       (scrolling_window): Only return 1 if we actually did scroll.
+
+       * xdisp.c (get_glyph_string_clip_rect): Fix reduction of cursor
+       height to glyph height when cursor row is not fully visible.
+       (make_cursor_line_fully_visible): Add FORCE_P arg to return
+       failure in case row is higher than window.  Callers changed.
+       (try_scrolling): Fix loop in scrolling if last_line_misfit (from Gerd).
+       Try to scroll partially visible, higher-than-window cursor row.
+       (redisplay_window): Always try to scroll partially visible,
+       higher-than-window cursor row - both initially and again with
+       centering_position = 0.
+       Clear desired matrix before retrying with centering_position = 0.
+
+2004-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * syntax.c (scan_lists): Simplify backward string scan.
+       Fix off-by-one boundary check for string and comment fences.
+
+2004-04-13  Joe Buehler  <jbuehler@hekimian.com>
+
+       * sheap.c, unexcw.c: New files.
+
+2004-04-12  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * buffer.c (Fmake_indirect_buffer): Throw an error if the intended
+       base buffer has been killed.  Correct the error message if the
+       base buffer does not exist.
+
+2004-04-12  Joe Buehler  <jbuehler@hekimian.com>
+
+       * s/cygwin.h: Changes for Cygwin unexec() support, changes in
+       Cygwin itself.  Add support for Xaw3d scrollbars.
+
+       * puresize.h: Set up PURE_P() for Cygwin unexec() support.
+
+       * lastfile.c: Define my_endbss[] for Cygwin unexec() support.
+
+       * gmalloc.c (__default_morecore): Use bss_sbrk(), not __sbrk(),
+       before Cygwin unexec.
+
+       * Makefile.in: Link changes for Cygwin unexec() support.
+
+2004-04-12  Andreas Schwab  <schwab@suse.de>
+
+       * buffer.c (Fmake_indirect_buffer): Check that NAME is a string.
+
+2004-04-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * buffer.c (Fgenerate_new_buffer_name): Return NAME argument if
+       IGNORE argument equals NAME.  Doc fix.
+
+2004-04-11  Masatake YAMATO  <jet@gyve.org>
+
+       * buffer.c (fix_start_end_in_overlays): Make overlays
+       empty if they are backwards.
+
+2004-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * xfaces.c (face_color_supported_p): Fix compilation without X11.
+
+2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * doc.c (Fsnarf_documentation): Ignore new file name entries.
+
+2004-04-06  Kim F. Storm  <storm@cua.dk>
+
+       * msdos.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+       (dos_rawgetc): Set mouse_face_hidden after clearing highlight.
+
+       * w32term.c (w32_read_socket): Set mouse_face_hidden after
+       clearing highlight.
+
+       * xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+
+       * xterm.c (handle_one_xevent): Set mouse_face_hidden after
+       clearing highlight.
+
+       * indent.c (vmotion): Do not reserve one column for continuation
+       marks on window frames.
+
+2004-04-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * charset.h (SINGLE_BYTE_CHAR_P): Fix macro to avoid warnings
+       from GCC.
+
+2004-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * .gdbinit-union: Remove.
+
+       * .gdbinit: Make it work for USE_LSB_TAG and !NO_LISP_UNION.
+       (xgetptr, xgetint, xgettype): New funs.  Use them everywhere.
+       ($nonvalbits): Remove.
+       ($valmask): Set it by calling xreload to avoid redundancy.
+
+       * emacs.c (gdb_use_union, gdb_use_lsb): New vars.
+       (gdb_emacs_intbits): Remove.
+
+2004-03-31  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
+
+2004-03-30  Kenichi Handa  <handa@m17n.org>
+
+       * editfns.c (Fformat): Fix initialization of the array info.
+
+2004-03-30  Kim F. Storm  <storm@cua.dk>
+
+       * xterm.c (x_mouse_click_focus_ignore_position): New var.
+       (syms_of_xterm): DEFVAR_BOOL it.
+       (ignore_next_mouse_click_timeout): New var.
+       (handle_one_xevent): Clear it on KeyPress, set it on EnterNotify.
+       Use it to filter mouse clicks following focus event.
+
+2004-03-29  David Ponce  <david@dponce.com>
+
+       * callint.c (Fcall_interactively): Fix last change.
+
+2004-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * eval.c (Fcommandp): Simplify.
+
+       * data.c (Finteractive_form): Rename from Fsubr_interactive_form.
+       Extend to handle all kinds of functions.
+
+       * lisp.h (Finteractive_form): Declare.
+
+       * callint.c (Fcall_interactively): Use it.
+
+2004-03-26  Kim F. Storm  <storm@cua.dk>
+
+       * xdisp.c (syms_of_xdisp): Include `void-variable' in list_of_error
+       to catch errors in calc_pixel_width_or_height during redisplay.
+
+2004-03-26  Masatake YAMATO  <jet@gyve.org>
+
+       * buffer.c (fix_start_end_in_overlays): Rename fix_overlays_in_range.
+
+       * lisp.h (fix_start_end_in_overlays): Likewise.
+
+       * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
+
+       * editfns.c (Ftranspose_regions): Likewise.
+
+2004-03-20  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (handle_one_xevent): Do not pass key press events to GTK.
+
+2004-03-19  Richard M. Stallman  <rms@gnu.org>
+
+       * s/sol2-6.h: Delete previous change.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+       * xdisp.c (move_it_in_display_line_to): Fix MOVE_TO_POS case when
+       to_charpos corresponds to newline in right fringe.  Use local
+       BUFFER_POS_REACHED_P macro.
+
+2004-03-19  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xdisp.c (calc_pixel_width_or_height): Add ifdef HAVE_WINDOW_SYSTEM
+       to compile on non-window system.
+
+2004-03-19  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h (calc_pixel_width_or_height): Add prototype.
+
+       * image.c (Qcenter): Move to xdisp.c.
+
+       * xdisp.c (Qcenter): Declare here.
+       (syms_of_xdisp): Intern and staticpro it.
+       (handle_single_display_prop): Allow space display property on all
+       platforms.
+       (display_mode_line): Set mode_line_p before displaying line.
+       (calc_pixel_width_or_height): Declare extern.  Add separate :align-to
+       handling.  Remove complex cases for fringes and scroll-bars.
+       Add left, right, and center alignment positions. Add text (area)
+       width/height.  Return width or height for image specs.
+       (produce_stretch_glyph): Improve handling of :align-to.  Is now
+       relative to left of text area by default, but other base offsets
+       can be specified -- also for text lines.
+
+       * term.c (produce_glyphs): Handle IT_STRETCH.
+       (produce_stretch_glyph): New function to handle space width and
+       align-to display properties on non-window systems.
+
+2004-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * fileio.c (Fread_file_name): Set completion-ignore-case for
+       case-insensitive systems.
+
+2004-03-14  Masatake YAMATO  <jet@gyve.org>
+
+       * xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
+       when keymap and cursor are setup.
+
+2004-03-14  Steven Tamm <steventamm@mac.com>
+
+       * Makefile.in (XMENU_OBJ) [HAVE_CARBON]: Do not include xmenu.o.
+
+2004-03-14  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h (x_find_image_file): Add prototype.
+
+       * image.c (x_find_image_file): Make extern.
+
+       * xfns.c (x_find_image_file): Remove prototype.
+
+2004-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (XMENU_OBJ): Include xmenu.o if HAVE_MENUS is defined.
+
+       * emacs.c (main): Call syms_of_xmenu only if HAVE_MENUS is defined.
+
+2004-03-12  Richard M. Stallman  <rms@gnu.org>
+
+       * fns.c (internal_equal): New arg PROPS controls comparing
+       text properties.  All callers changed.
+       (Fequal_including_properties): New function.
+       (syms_of_fns): defsubr it.
+
+2004-03-12  Kim F. Storm  <storm@cua.dk>
+
+       Fix image support on MAC.  From YAMAMOTO Mitsuharu.
+
+       * dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs.
+       (image_background, image_background_transparent): Fix prototypes.
+
+       * image.c (XImagePtr, XImagePtr_or_DC): Move typedefs to dispextern.h.
+
+       * macfns.c (x_list_fonts, x_get_font_info, x_load_font)
+       (x_query_font, x_find_ccl_program, x_set_window_size)
+       (x_make_frame_visible, mac_initialize, XCreatePixmap)
+       (XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
+       (mac_draw_line_to_pixmap): Move prototypes to macterm.h.
+
+       * macterm.h (x_list_fonts, x_get_font_info, x_load_font)
+       (x_query_font, x_find_ccl_program, x_set_window_size)
+       (x_make_frame_visible, mac_initialize, XCreatePixmap)
+       (XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
+       (mac_draw_line_to_pixmap): Add prototypes.
+
+2004-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (XTread_socket): Fix mouse click on tool bar.
+
+2004-03-11  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h: Move image related prototypes from xfns.c section
+       to image.c.  Condition them by HAVE_WINDOW_SYSTEM rather than
+       HAVE_X_WINDOWS.
+
+       * Makefile.in (XOBJ): Consolidate into one list.  Add image.o.
+       Move gtkutil.o to new GTK_OBJ list.
+       (XMENU_OBJ) [HAVE_MENUS]: Move declaration to proper place.
+       (GTK_OBJ) [USE_GTK]: New declaration.
+       (obj): Add $(GTK_OBJ) to list.
+
+2004-03-11  Steven Tamm <steventamm@mac.com>
+
+       * image.c [MAC_OSX]: Include sys/stat.h
+
+       * macfns.c (syms_of_macfns): Remove definitions of things now
+       defined in image.c
+
+2004-03-11  Kim F. Storm  <storm@cua.dk>
+
+       The following changes consolidates the identical/similar image
+       support code previously found in xfns.c, w32fns.c, and macfns.c
+       into a new file image.c.
+
+       * makefile.w32-in (OBJ1): Add image.o.
+       ($(BLD)/image.$(O)): Add dependencies.
+
+       * Makefile.in (XOBJ, MAC_OBJ): Add image.o.
+       (image.o): Add dependencies.
+
+       * image.c: New file with consolidated image support code.
+       (COLOR_TABLE_SUPPORT): New define to control whether
+       color table support is available (X only).
+       (Bitmap_Record): Common name for x_bitmap_record,
+       w32_bitmap_record, and mac_bitmap_record.
+       (XImagePtr): Common name for pointer to XImage or equivalent.
+       (XImagePtr_or_DC): New type to simplify code sharing; equivalent
+       to XImagePtr on X+MAC, and to HDC on W32.
+       (GET_PIXEL): Wrapper for XGetPixel or equivalent.
+       (NO_PIXMAP): Common name for "None" or equivalent.
+       (PNG_BG_COLOR_SHIFT): Bits to shift PNG background colors.
+       (RGB_PIXEL_COLOR): Common type for an integer "pixel color" value.
+       (PIX_MASK_RETAIN, PIX_MASK_DRAW): Portability macros (from macfns.c).
+       (FRAME_X_VISUAL, x_defined_color, DefaultDepthOfScreen):
+       Define with suitable equivalents on W32 and MAC for code sharing.
+       (XDrawLine): Define on MAC for code sharing.
+       (Destroy_Image, Free_Pixmap): Wrappers for code sharing.
+       (IF_LIB_AVAILABLE): Macro to simplify code sharing.
+       (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
+       (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_destroy_all_bitmaps, x_create_bitmap_mask)
+       (XGetImage, XPutPixel, XGetPixel, XDestroyImage)
+       (QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
+       (QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
+       (Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
+       (define_image_type, lookup_image_type, valid_image_p)
+       (image_error, enum image_value_type, struct image_keyword)
+       (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
+       (make_image, free_image, prepare_image_for_display, image_ascent)
+       (four_corners_best, image_background, image_background_transparent)
+       (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+       (make_image_cache, free_image_cache, clear_image_cache)
+       (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
+       (forall_images_in_image_cache, x_create_x_image_and_pixmap)
+       (x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
+       (find_image_fsspec, image_load_qt_1, image_load_quicktime)
+       (init_image_func_pointer, image_load_quartz2d)
+       (struct ct_color, init_color_table, free_color_table)
+       (lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
+       (cross_disabled_images, x_to_xcolors, x_from_xcolors)
+       (x_detect_edges, x_emboss, x_laplace, x_edge_detection)
+       (x_disable_image, x_build_heuristic_mask)
+       (XBM support, XPM support, PBM support, PNG support, JPEG support)
+       (TIFF support, GIF support, Ghostscript support): Consolidate image
+       code from xfns.c, w32fns.c, and macfns.c.
+       (syms_of_image): Consolidate image related symbol setup here.
+       (init_image): Consolidate image related initializations here.
+
+       * emacs.c (main) [HAVE_WINDOW_SYSTEM]: Add calls to syms_of_image
+       and init_image.  Remove call to init_xfns.
+
+       * macterm.h (struct mac_bitmap_record): Add file member.
+       Not currently used, but simplifies code sharing.
+
+       * macfns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
+       (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_destroy_all_bitmaps, x_create_bitmap_mask)
+       (XGetImage, XPutPixel, XGetPixel, XDestroyImage)
+       (QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
+       (QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
+       (Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
+       (define_image_type, lookup_image_type, valid_image_p)
+       (image_error, enum image_value_type, struct image_keyword)
+       (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
+       (make_image, free_image, prepare_image_for_display, image_ascent)
+       (four_corners_best, image_background, image_background_transparent)
+       (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+       (make_image_cache, free_image_cache, clear_image_cache)
+       (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
+       (forall_images_in_image_cache, x_create_x_image_and_pixmap)
+       (x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
+       (find_image_fsspec, image_load_qt_1, image_load_quicktime)
+       (init_image_func_pointer, image_load_quartz2d)
+       (struct ct_color, init_color_table, free_color_table)
+       (lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
+       (cross_disabled_images, x_to_xcolors, x_from_xcolors)
+       (x_detect_edges, x_emboss, x_laplace, x_edge_detection)
+       (x_disable_image, x_build_heuristic_mask)
+       (XBM support, XPM support, PBM support, PNG support, JPEG support)
+       (TIFF support, GIF support, Ghostscript support): Merge with image
+       code from xfns.c and macfns.c into image.c.
+       (syms_of_xfns): Move image related symbols to image.c.
+       (init_external_image_libraries, init_xfns): Remove; initialization
+       moved to init_image in image.c.
+
+       * w32fns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
+       (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_destroy_all_bitmaps, x_create_bitmap_mask)
+       (QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
+       (QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
+       (Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
+       (define_image_type, lookup_image_type, valid_image_p)
+       (image_error, enum image_value_type, struct image_keyword)
+       (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
+       (make_image, free_image, prepare_image_for_display, image_ascent)
+       (four_corners_best, image_background, image_background_transparent)
+       (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+       (make_image_cache, free_image_cache, clear_image_cache)
+       (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
+       (forall_images_in_image_cache, x_create_x_image_and_pixmap)
+       (x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
+       (struct ct_color, init_color_table, free_color_table)
+       (lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
+       (cross_disabled_images, x_to_xcolors, x_from_xcolors)
+       (x_detect_edges, x_emboss, x_laplace, x_edge_detection)
+       (x_disable_image, x_build_heuristic_mask)
+       (XBM support, XPM support, PBM support, PNG support, JPEG support)
+       (TIFF support, GIF support, Ghostscript support): Merge with image
+       code from xfns.c and macfns.c into image.c.
+       (syms_of_xfns): Move image related symbols to image.c.
+       (init_external_image_libraries, init_xfns): Remove; initialization
+       moved to init_image in image.c.
+
+       * xfns.c (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
+       (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_destroy_all_bitmaps, x_create_bitmap_mask)
+       (QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
+       (QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
+       (Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
+       (define_image_type, lookup_image_type, valid_image_p)
+       (image_error, enum image_value_type, struct image_keyword)
+       (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
+       (make_image, free_image, prepare_image_for_display, image_ascent)
+       (four_corners_best, image_background, image_background_transparent)
+       (x_clear_image_1,  x_clear_image, x_alloc_image_color)
+       (make_image_cache, free_image_cache, clear_image_cache)
+       (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
+       (forall_images_in_image_cache, x_create_x_image_and_pixmap)
+       (x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
+       (struct ct_color, init_color_table, free_color_table)
+       (lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
+       (cross_disabled_images, x_to_xcolors, x_from_xcolors)
+       (x_detect_edges, x_emboss, x_laplace, x_edge_detection)
+       (x_disable_image, x_build_heuristic_mask)
+       (XBM support, XPM support, PBM support, PNG support, JPEG support)
+       (TIFF support, GIF support, Ghostscript support): Merge with
+       w32fns.c and macfns.c image code into image.c.
+       (syms_of_xfns): Move image related symbols to image.c.
+       (init_xfns): Remove; initialization moved to init_image in image.c.
+
+       * lisp.h (syms_of_image, init_image): Add protoypes.
+       (init_xfns): Remove prototype.
+
+       * dispextern.h (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_create_bitmap_mask): Move prototypes from dispextern.h.
+       (gamma_correct) [MAC_OS]: Add prototype.
+
+       * xterm.h (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
+       (x_reference_bitmap, x_create_bitmap_from_data)
+       (x_create_bitmap_from_file, x_destroy_bitmap)
+       (x_create_bitmap_mask): Move prototypes to dispextern.h.
+
 2004-03-09  Kenichi Handa  <handa@etlken2>
 
        * coding.c (decode_coding_emacs_mule): Handle insufficent source
        * w32term.c (w32_draw_fringe_bitmap): Draw overlaid bitmaps
        correctly over other bitmaps.
 
-2004-02-21  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-21  Eli Zaretskii  <eliz@gnu.org>
 
        * emacs.c (USAGE1): Split into two halves.
        (USAGE2): Second half of the old USAGE1.
        (read_avail_input): Use it to zero out only those slots in buf[]
        that were used last time we were called.
 
-2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-16  Eli Zaretskii  <eliz@gnu.org>
 
        * Makefile.in (obj): Move fringe.o from here...
        (XOBJ, MAC_OBJ): ...to here.
        if vector_ret_p is true.
        (syms_of_xfns): Sx_send_client_message moved to xselect.c.
 
-2004-02-02  Eli Zaretskii  <eliz@elta.co.il>
+2004-02-02  Eli Zaretskii  <eliz@gnu.org>
 
        * fileio.c (Fcopy_file): If NEWNAME is a directory, expand the
        basename of FILE relative to it, not FILE itself.
        (syms_of_fileio): Adapt the docstring of insert-default-directory
        to the change in Fread_file_name.
 
-2004-01-29  Eli Zaretskii  <eliz@elta.co.il>
+2004-01-29  Eli Zaretskii  <eliz@gnu.org>
 
        * alloca.c [!alloca]: Fix the prototype for xfree.
 
        * fontset.c (Finternal_char_font): Change return value to
        cons (FONT-NAME . GLYPH-CODE).
 
-2003-09-28  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-28  Eli Zaretskii  <eliz@gnu.org>
 
        * term.c (tty_setup_colors): Treat any negative argument as -1.
 
 
        * process.c (Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ... macros.
 
-2003-09-22  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-22  Eli Zaretskii  <eliz@gnu.org>
 
        * term.c (set_tty_color_mode): Use INTEGERP to test whether a
        color mode is an integer number (it could be -1).
        * alloc.c: Use long instead of int when casting ABLOCKS_BUSY to
        avoid warning.
 
-2003-09-07  Eli Zaretskii  <eliz@elta.co.il>
+2003-09-07  Eli Zaretskii  <eliz@gnu.org>
 
        * editfns.c (region_limit): Support any non-zero value of BEGINNINGP.
 
        * xfns.c (Vgtk_version_string): New variable.
        (syms_of_xfns): DEFVAR_LISP it.  Provide gtk.
 
-2003-08-24  Eli Zaretskii  <eliz@elta.co.il>
+2003-08-24  Eli Zaretskii  <eliz@gnu.org>
 
        * term.c (term_init): Remove `const' from buffer_size's declaration.