Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
   Remove "-face" suffix from lazy-highlight face name

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
   Fix regressions from latest reftex update

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
   Merge from miles@gnu.org--gnu-2004

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3
   Merge from emacs--cvs-trunk--0

1 files changed, 208 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e2da7ae1a5f..18bd89e9dda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,206 @@
+2005-01-15  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (Vmac_use_core_graphics): defined for
+        mac-allow-anti-aliasing
+        (syms_of_macterm): Added mac-allow-anti-aliasing
+        (mac_draw_string_common): Use core graphics text rendering if
+        mac-allow-anti-aliasing is enabled.
+
+        * macfns.c (Fx_file_dialog): Save As dialog includes only the
+        file name in the text box.
+
+2005-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (x_set_foreground_color, x_set_background_color): Sync
+        with xfns.c.
+        (mac_window, x_create_tip_frame): Use XSetWindowBackground.
+        * macterm.c (XSetBackground, XSetWindowBackground): New functions.
+        * macterm.h (XSetBackground, XSetWindowBackground): Add externs.
+
+2005-01-14  Kim F. Storm  <storm@cua.dk>
+
+        * keyboard.c (Fposn_at_x_y): Add optional arg WHOLE.
+
+2005-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (Fcurrent_active_maps): Ignore Voverriding_local_map
+        if Voverriding_terminal_local_map is non-nil.
+
+        * keyboard.c (syms_of_keyboard): Doc fix.
+
+2005-01-13  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (Fformat_mode_line): Fix last change.  Remove NO_PROPS arg
+        (specify 0 for FACE instead). Reorder arg list.  Doc fix.
+
+2005-01-12  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): New arg FACE specifies a default
+        face property for characters that don't specify one.
+
+        * fns.c (Frequire): Record in load-history unconditionally.
+
+2005-01-10  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (merge_faces): Rename from merge_into_realized_face.
+
+        * xfaces.c (merge_faces): Rename from merge_into_realized_face.
+        Callers changed.
+        Add support to merge with lisp face id too (if face_name is t).
+
+        * xdisp.c (get_next_display_element, next_element_from_display_vector):
+        Don't lookup lface_id from display table glyphs here; instead use
+        merge_faces to merge the lisp face id into current face.
+
+2005-01-09  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct it): New member dpvec_face_id.
+        (merge_into_realized_face): Add prototype.
+
+        * xfaces.c (merge_into_realized_face): New function.  Used to
+        merge escape-glyph face or face from display table into current face.
+
+        * xdisp.c (Vshow_nonbreak_escape): New lisp var.
+        (syms_of_xdisp): DEFVAR_LISP it.
+        (escape_glyph_face): Remove var.
+        (redisplay_window): Don't initialize it.
+        (setup_for_ellipsis, get_next_display_element):
+        Set it->dpvec_face_id to -1.
+        (get_next_display_element): Test Vshow_nonbreak_escape.
+        Do not setup escape_glyph_face.
+        Properly merge escape-glyph face or face from display table with
+        current face for escape and control characters.  Set
+        it->dpvec_face_id to relevant face id instead of adding it to each
+        element of display vector.
+        (next_element_from_display_vector): If it->dpvec_face_id is set,
+        use that instead of lface_id from glyph itself.
+
+2005-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): New member, toolbar_detached.
+
+        * gtkutil.c (xg_create_frame_widgets): Set initial tool bar height to
+        38.
+        (xg_tool_bar_detach_callback): Set toolbar_detached to 1.
+        (xg_tool_bar_attach_callback): Set toolbar_detached to 0.
+        (xg_create_tool_bar): Initialize toolbar_detached.
+        (update_frame_tool_bar): Only set FRAME_TOOLBAR_HEIGHT (f) if
+        toolbar_detached is zero.
+
+2005-01-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (create_and_show_popup_menu): Pass zero as button to
+        gtk_menu_popup if not for_click, so callbacks for the menu are called.
+
+        * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
+        (xg_tool_bar_callback, xg_tool_bar_help_callback)
+        (update_frame_tool_bar): Cast to EMACS_INT to avoid compiler
+        warning.
+
+        * xselect.c (x_get_foreign_selection, x_fill_property_data)
+        (Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
+        XFLOAT_DATA to get extract number from Lisp object.
+
+2005-01-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_iterator_to_next): Fix 2004-12-13 change.
+        Set stop_charpos to current charpos instead of 0.
+
+2005-01-06  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xdisp.c (Fformat_mode_line): First arg now required.
+
+2005-01-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (XLoadQueryFont): Correctly handle 0 size
+        font widths that are returned from some Japanese fonts.
+
+2005-01-06  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (fringe_faces): Change to Lisp_Object pointer.
+        (draw_fringe_bitmap_1): Lookup user defined fringe faces here.
+        (destroy_fringe_bitmap): Set fringe_faces element to nil.
+        (Fdefine_fringe_bitmap, init_fringe): Change allocation of
+        fringe_faces array and init elements to nil.
+        (Fset_fringe_bitmap_face): Set fringe_faces to face name instead of
+        non-persistent face id.
+        (mark_fringe_data): New function for GC.
+
+        * alloc.c (mark_fringe_data): Declare extern.
+        (Fgarbage_collect): Call mark_fringe_data.
+
+        * alloc.c (overrun_check_free): Invalidate freed memory if
+        XMALLOC_CLEAR_FREE_MEMORY is defined.
+
+2005-01-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c: Include sys/param.h.
+        [TARGET_API_MAC_CARBON] (mac_nav_event_callback): New declaration
+        and function.
+        [TARGET_API_MAC_CARBON] (Fx_file_dialog): Use MAXPATHLEN for size
+        of filename string.  Set event callback function when creating
+        dialog boxes.  Add code conversions for filenames.  Don't dispose
+        apple event descriptor record if failed to create it.
+
+        * macterm.c: Include sys/param.h.
+        [USE_CARBON_EVENTS] (mac_handle_window_event): Add handler for
+        kEventWindowUpdate.
+        (install_window_handler) [USE_CARBON_EVENTS]: Register it.
+        (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Get FSRef instead
+        of FSSpec from apple event descriptor record.
+        (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Use MAXPATHLEN for
+        size of filename string.
+        [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.
+        [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a
+        file dialog is in action.
+        [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.  Reject
+        only when there are no filename items.  Set background color
+        before (un)highlighting the window below the dragged items.
+        (XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.
+
+2005-01-05  Romain Francoise  <romain@orebokech.com>
+
+        * term.c (encode_terminal_code): Fix buffer size computation.
+
+2005-01-04  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): Doc fix.
+
+2005-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * alloc.c (refill_memory_reserve): Move.
+        (emacs_blocked_free, emacs_blocked_malloc, emacs_blocked_realloc)
+        (reset_malloc_hooks, uninterrupt_malloc) [SYNC_INPUT]: Don't define.
+
+2005-01-03  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (window_scroll_pixel_based): Don't correct preserve_y
+        for CURRENT_HEADER_LINE_HEIGHT when moving backwards.
+
+2005-01-03  Jason Rumney  <jasonr@gnu.org>
+
+        * w32bdf.c (w32_load_bdf_font): Set fontp->average_width and
+        fontp->space_width to FONT_WIDTH so they are valid.
+
+        * w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
+        average width. Set fontp->average_width and fontp->space_width to
+        their appropriate values.
+
+        * w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
+        fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
+        fontp->space_width.
+
+2005-01-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_new_font): Set FRAME_SPACE_WIDTH.
+        (x_font_min_bounds, XLoadQueryFont): Use the correct font width
+        metrics for max and min bounds.
+        (x_load_font): Correctly calculate average font width metrics.
+
+2005-01-02  Richard M. Stallman  <rms@gnu.org>
+
+        * alloc.c (Fgarbage_collect): Don't truncate_undo_list on dead buffers.
+
 2004-12-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xterm.c (handle_one_xevent): Clear area in expose event for GTK.
@@ -48,7 +251,7 @@
 
         * xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
         fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
-        fontp-?space_width..
+        fontp->space_width.
         (x_load_font): Calculate fontp->space_width and
         fontp->average_width.
         (x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.
@@ -298,6 +501,10 @@
         * gtkutil.c (xg_initialize): Install bindings for C-g so that
         dialogs and menus pop down.
 
+2004-12-27  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (code_convert_region): Fix calculation of `ratio'.
+
 2004-12-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (update_frame_tool_bar): Make the value of