Merged in changes from CVS trunk. (Long time no see!) :-)

Patches applied:

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

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

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

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

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

 * 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
   Update from CVS

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

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

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

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

 * 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
   Update from CVS

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

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

 * 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
   Update from CVS

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

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

 * 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
   Update from CVS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * 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/emacs--cvs-trunk--0--patch-41
   Update from CVS

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
   Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
   src/dispextern.h (xassert): Enable unconditionally.

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

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

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

 * 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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
   Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
   Update from CVS

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-9
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-10
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-281

40 files changed, 1924 insertions, 677 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index ad6be09ec46..358774f5bec 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -35,20 +35,23 @@ handle 2 noprint pass
 # debugging.
 handle SIGALRM ignore
 
-# Set up a mask to use.
-# This should be EMACS_INT, but in some cases that is a macro.
-# long ought to work in all cases right now.
+# $valmask and $tagmask are mask values set up by the xreload macro below.
 
+# Use $bugfix so that the value isn't a constant.
+# Using a constant runs into GDB bugs sometimes.
 define xgetptr
-  set $ptr = (gdb_use_union ? $arg0.u.val : $arg0 & $valmask) | gdb_data_seg_bits
+  set $bugfix = $arg0
+  set $ptr = (gdb_use_union ? $bugfix.u.val : $bugfix & $valmask) | gdb_data_seg_bits
 end
 
 define xgetint
-  set $int = gdb_use_union ? $arg0.s.val : (gdb_use_lsb ? $arg0 : $arg0 << gdb_gctypebits) >> gdb_gctypebits
+  set $bugfix = $arg0
+  set $int = gdb_use_union ? $bugfix.s.val : (gdb_use_lsb ? $bugfix : $bugfix << gdb_gctypebits) >> gdb_gctypebits
 end
 
 define xgettype
-  set $type = gdb_use_union ? $arg0.s.type : (enum Lisp_Type) (gdb_use_lsb ? $arg0 & $tagmask : $arg0 >> gdb_valbits)
+  set $bugfix = $arg0
+  set $type = gdb_use_union ? $bugfix.s.type : (enum Lisp_Type) (gdb_use_lsb ? $bugfix & $tagmask : $bugfix >> gdb_valbits)
 end
 
 # Set up something to print out s-expressions.
diff --git a/src/ChangeLog b/src/ChangeLog
index 494f45f9af8..6dd4211364f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,526 @@
+2005-02-03  Richard M. Stallman  <rms@gnu.org>
+
+        * xterm.c (x_error_quitter): On GCC 3 and up, specify noinline.
+
+        * xdisp.c (echo_area_display): Clear echo_message_buffer.
+
+        * buffer.c (Fbury_buffer): Doc fix.
+
+2005-02-02  Steven Tamm  <steventamm@mac.com>
+
+        * macfns.c (unwind_create_frame): Fixing compile error due to
+        xassert being uncondition, but predicate is.
+        * dispnew.c (update_window): Fixing compile error due to
+        xassert being uncondition, but predicate is.
+
+2005-02-02  Miles Bader  <miles@gnu.org>
+
+        * dispextern.h (xassert): Enable unconditionally.
+
+2005-02-02  Kim F. Storm  <storm@cua.dk>
+
+        * undo.c (Fprimitive_undo): Fix dummy apply undo entry.
+
+2005-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * casefiddle.c (casify_object): Enable changing characters of
+        different byte length.
+        (casify_region): Fix loop condition, args to replace_range_2, and
+        update opoint_byte.
+
+        * insdel.c (replace_range_2): Fix bugs in adjusting markers and
+        point.
+
+2005-02-01  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (back_to_previous_visible_line_start): Reset iterator
+        stack before calling handle_display_prop.
+
+2005-01-31  Kim F. Storm  <storm@cua.dk>
+
+        * undo.c (Qapply): New lisp var.
+        (syms_of_undo): Intern and staticpro it.
+        (Fprimitive_undo): Support formats (apply FUNNAME . ARGS) and
+        (apply DELTA BEG END FUNNAME . ARGS) instead of (FUNNAME . ARGS).
+
+        * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
+2005-01-30  Jesper Harder  <harder@phys.au.dk>
+
+        * macterm.c (syms_of_macterm) <mac-reverse-ctrl-meta>
+        <mac-emulate-three-button-mouse>: Fix docstring indentation.
+
+2005-01-29  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * undo.c (syms_of_undo) <undo-outer-limit>: Doc update.
+        Increase value to 3 Meg.
+
+2005-01-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (show_hourglass): Use FRAME_X_WINDOW as parent for GTK,
+        button events are not received otherwise.
+
+2005-01-29  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
+
+        * undo.c (Fprimitive_undo): Handle (FUNNAME . ARGS) by calling FUNNAME.
+
+2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (access_keymap): YAILOM.
+
+2005-01-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (get_phys_cursor_geometry): New function to calculate
+        phys cursor position and size for hollow cursor.  Position is
+        aligned with get_glyph_string_clip_rect and ensures that a hollow
+        cursor is shown, even when the actual glyph is not visible.
+
+        * dispextern.h (get_phys_cursor_geometry): Add prototype.
+
+        * xterm.c (x_clip_to_row): Ensure y >= 0.
+        (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+        * w32term.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+        * macterm.c (x_draw_hollow_cursor): Use get_phys_cursor_geometry.
+
+2005-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_error_quitter): Add a prototype.  Make it static again.
+
+2005-01-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (get_glyph_string_clip_rect): Always show a cursor
+        glyph, even when row is only partially visible and actual cursor
+        position is not visible.
+
+2005-01-24  Richard M. Stallman  <rms@gnu.org>
+
+        * xterm.c (x_error_quitter): No longer static, and moved after
+        x_error_handler.
+
+2005-01-24  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (move_it_by_lines): If we move forward after going too
+        far back, cancel move if end position is same as start position.
+
+2005-01-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispextern.h (struct glyph_string): New members clip_head and
+        clip_tail.
+
+        * xdisp.c (get_glyph_string_clip_rect): Restrict horizontal clip
+        region to the area between clip_head and clip_tail.
+        (draw_glyphs): Record the area that need to be actually redrawn to
+        the new variables clip_head and clip_tail when there are
+        overhangs.  Set values of these variables to the corresponding
+        members in struct glyph_string.  Refine x coordinates for
+        notice_overwritten_cursor using clip_head and clip_tail.
+
+        * macgui.h (STORE_XCHARSETSTRUCT): New macro.
+
+        * macterm.c (mac_compute_glyph_string_overhangs): Implement with
+        QDTextBounds.
+        (x_draw_glyph_string): Don't fill the background of the successor
+        of a glyph with a right overhang if the successor will draw a cursor.
+        (XLoadQueryFont): Obtain font metrics using QDTextBounds.
+        (x_redisplay_interface): Add entry for compute_glyph_string_overhangs.
+
+2005-01-24  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (window_scroll_pixel_based): Fix scrolling in the wrong
+        direction if window height was smaller than next-screen-context-lines.
+        Now always scroll at least one line in the requested direction.
+        Ensure that we actually do scroll backwards when requested to do so.
+
+        * xdisp.c (redisplay_window): Only try to make cursor line fully
+        visible once (to avoid redisplay loop).
+
+2005-01-23  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (Fpos_visible_in_window_p): Simplify return value for
+        partially visible rows.
+        (window_scroll_pixel_based): Adapt to that change.
+
+        * window.c (window_scroll_pixel_based): Force moving to next line
+        if scrolling doesn't move start point, e.g. if looking at tall image.
+
+        * xdisp.c (pos_visible_p): Return 0 if non-interactive.
+        Clear last_height before calling line_bottom_y to get real height.
+        Fix calculation of y.
+
+2005-01-22  Steven Tamm  <steventamm@mac.com>
+
+        * s/darwin.h: Removed PTY_ITERATION from here.
+        (DARWIN): Define.
+        * process.c (init_process): Default process-connection-type to
+        nil on darwin 6 or less, t if it is 7 or higher.  This way the
+        broken pty behavior is still allowed on darwin 6 for interactive
+        processes for people that know what they are doing.
+
+2005-01-22  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (auto_window_vscroll_p): New boolean.
+        (syms_of_window): DEFVAR_BOOL it.
+        (Fpos_visible_in_window_p): Extend return value to include RTOP
+        and RBOT values if FULLY is nil.
+        (window_scroll_pixel_based): Adjust vscroll for partially visible
+        rows if auto_window_vscroll_p is set.
+        (Fset_window_vscroll): Do nothing if vscroll is not modified.
+
+        * xdisp.c (pos_visible_p): Replace FULLY arg by RTOP and RBOT args
+        to return number of partially invisible pixels at top and bottom
+        of the dislay row at POS.
+
+        * lisp.h (pos_visible_p): Fix prototype.
+
+2005-01-21  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Fcopy_file): Doc fix.
+
+2005-01-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_tool_bar_detach_callback): Remove unused variable bw.
+        (xg_get_file_name): Move declaration ofx_use_old_gtk_file_dialog to
+        start of function for older compilers.
+
+2005-01-20  Richard M. Stallman  <rms@gnu.org>
+
+        * editfns.c (Fmessage): If arg is "", return "" (as before).
+
+        * keymap.c (access_keymap): Protect from bad value of meta_prefix_char.
+
+        * .gdbinit (xgetptr, xgetint, xgettype): Copy $arg0 into a temp
+        variable.
+
+2005-01-20  Steven Tamm  <steventamm@mac.com>
+
+        * editfns.c (Voperating_system_release): Add.
+        (init_editfns): Assign new variable operating-system-release
+        based on call to uname if available.
+        (get_operating_system_release): Add function to
+        allow c-level access to operating system release.
+
+        * config.h: Regenerated.
+
+        * s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or less.
+        (MIN_PTY_KERNEL_VERSION): Define minimum kernel version for
+        using ptys as '7'.
+
+2005-01-20  Kim F. Storm  <storm@cua.dk>
+
+        * alloc.c (STRING_MARKED_P, VECTOR_MARKED_P): Return boolean.
+
+        * xterm.c (x_draw_glyph_string_box): Fix last_x for full width rows.
+        Thanks to Chong Yidong <cyd@stupidchicken.com> for debugging this.
+
+        * macterm.c (x_draw_glyph_string_box): Likewise.
+
+        * w32term.c (x_draw_glyph_string_box): Likewise.
+
+        * indent.c (Fvertical_motion): Temporarily disable selective display.
+
+2005-01-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (note_mode_line_or_margin_highlight): Fix :pointer
+        image property.
+
+        * fns.c (sweep_weak_table): Advance prev pointer when we keep a pair.
+
+2005-01-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fast_find_position): Backtrack to find first row if
+        charpos is inside a display overlay that spans multiple lines.
+
+2005-01-18  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_iso2022): Translate invalid codes if
+        translation-table is specified.
+
+2005-01-18  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (back_to_previous_visible_line_start): Undo 2004-12-28
+        change.  If handle_display_prop indicates newline is replaced by
+        image or text, move back to start of relevant overlay or interval
+        and continue scan from there.  Simplify.
+
+2005-01-17  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (mode_line_string, marginal_area_string):
+        Fix off-by-one error in search for glyph.
+
+2005-01-16  Kim F. Storm  <storm@cua.dk>
+
+        * macterm.c (syms_of_macterm) <mac-allow-anti-aliasing>: Doc fix.
+
+2005-01-16  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (mac_to_x_fontname): Remove spurious argument.
+
+2005-01-16  Andreas Schwab  <schwab@suse.de>
+
+        * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1.
+
+2005-01-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
+        fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
+
+2005-01-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
+        (READABLE_EVENTS_FILTER_EVENTS, READABLE_EVENTS_IGNORE_SQUEEZABLES):
+        New flags for readable_events.
+        (get_filtered_input_pending, readable_filtered_events): Remove.
+        (tracking_off): Call readable_events and get_input_pending with
+        flag READABLE_EVENTS_DO_TIMERS_NOW.
+        (readable_events): Move code from old readable_filtered_events here,
+        but check new READABLE_EVENTS_* in argument flags instead of previous
+        two boolean arguments do_timers_now and filter_events.
+        If we are doing mouse tracking and the mouse moved, return only if
+        READABLE_EVENTS_IGNORE_SQUEEZABLES is not set in flags.
+        (swallow_events): Call get_input_pending with flag
+        READABLE_EVENTS_DO_TIMERS_NOW.
+        (get_input_pending): Move code from old get_filtered_input_pending
+        here.  Replace boolean arguments do_timers_now, filter_events with
+        flags, and pass flags to readable_events.  Document new
+        READABLE_EVENTS_* flags.
+        (detect_input_pending_ignore_squeezables): New function.
+        (detect_input_pending_run_timers): Call get_input_pending with flag
+        READABLE_EVENTS_DO_TIMERS_NOW.
+        (Finput_pending_p): Call get_input_pending with flags
+        READABLE_EVENTS_DO_TIMERS_NOW and READABLE_EVENTS_FILTER_EVENTS.
+
+        * dispnew.c (update_window, update_frame_1): Replace calls to
+        detect_input_pending with detect_input_pending_ignore_squeezables
+        so that redisplay is not paused if the event queue contains only
+        mouse movements.
+
+        * lisp.h: Declare detect_input_pending_ignore_squeezables.
+
+2005-01-15  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (Vmac_use_core_graphics): Declare variable for
+        mac-allow-anti-aliasing.
+        (syms_of_macterm): DEFVAR_LISP and initialize it.
+        (mac_draw_string_common): Use core graphics text rendering if
+        mac-allow-anti-aliasing is enabled.
+
+        * macfns.c (Fx_file_dialog): Save As dialog includes only the
+        file name in the text box.
+
+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.
 
 2004-12-31  Richard M. Stallman  <rms@gnu.org>
 
+        * xdisp.c (setup_for_ellipsis, get_next_display_element):
+        Set it->ellipsis_p to 1 or 0.
+        (display_line): Record whether row ends in mid-ellipsis.
+        (set_cursor_from_row): If ends in ellipsis. find start of it.
+        (cursor_row_p): If PT's at the end of the ellipsis the row
+        ends within, don't display cursor on this row.
+
+        * dispextern.h (struct it): New element ellipsis_p.
+        (struct glyph_row): New element ends_in_ellipsis_p.
+
+        * xdisp.c (BUFFER_POS_REACHED_P): We haven't reached the specified
+        position if we're reading from something other than the buffer.
+
         * window.c (window_scroll_pixel_based): Only look at
         Vscroll_preserve_screen_position if the old PT can't be kept.
         (syms_of_window) <scroll-preserve-screen-position>: Doc fix.
@@ -22,8 +539,7 @@
 
         * fileio.c (Finsert_file_contents): Don't use
         current_buffer->buffer_file_coding_system even if REPLACE is
-        non-nil.  Call Qafter_insert_file_set_coding with the second arg
-        VISIT.
+        non-nil.  Call Qafter_insert_file_set_coding with the second arg VISIT.
 
         * fontset.h (struct font_info): New members space_width and
         average_width.
@@ -35,9 +551,8 @@
 
         * xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
         fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
-        fontp-?space_width..
-        (x_load_font): Calculate fontp->space_width and
-        fontp->average_width.
+        fontp->space_width.
+        (x_load_font): Calculate fontp->space_width and fontp->average_width.
         (x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.
 
         * xdisp.c (x_produce_glyphs): Calculate tab width by
@@ -46,8 +561,7 @@
 2004-12-29  Sanghyuk Suh  <han9kin@mac.com>
 
         * macterm.c (SelectionRange): Add Xcode position apple event struct.
-        (do_ae_open_documents): Handle Xcode-style file position open
-        events.
+        (do_ae_open_documents): Handle Xcode-style file position open events.
 
 2004-12-29  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -73,11 +587,16 @@
         init_mac_drag_n_drop.
         (mac_do_track_drag): New function and declaration.
         (install_window_handler): Return OSErr value.
-        (install_window_handler) [TARGET_API_MAC_CARBON]: Register
-        handlers for tracking/receiving drag-and-drop items.
+        (install_window_handler) [TARGET_API_MAC_CARBON]:
+        Register handlers for tracking/receiving drag-and-drop items.
         (do_ae_open_documents): Generate unibyte strings for filenames.
-        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.  Reject
-        only non-filename items.  Set event modifiers.  Set return value.
+<<<<<<< ChangeLog
+        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+        Reject only non-filename items.  Set event modifiers and return value.
+=======
+        (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+        Reject only non-filename items.  Set event modifiers, and return value.
+>>>>>>> 1.4187
 
 2004-12-28  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -101,8 +620,8 @@
         * xmenu.c (popup_get_selection): Only pop down dialogs
         on C-g and Escape.
         (popup_get_selection): Remove parameter down_on_keypress.
-        (create_and_show_popup_menu, create_and_show_dialog): Remove
-        parameter down_on_keypress to popup_get_selection.
+        (create_and_show_popup_menu, create_and_show_dialog):
+        Remove parameter down_on_keypress to popup_get_selection.
 
 2004-12-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -119,8 +638,8 @@
 
         * frame.c (x_set_frame_parameters, x_report_frame_params)
         (x_set_fullscreen): Remove #ifndef HAVE_CARBON.
-        (x_set_border_width, Vdefault_frame_scroll_bars): Change
-        HAVE_CARBON to MAC_OS.
+        (x_set_border_width, Vdefault_frame_scroll_bars):
+        Change HAVE_CARBON to MAC_OS.
 
         * image.c [MAC_OS]: Include sys/stat.h.
         [MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
@@ -128,8 +647,7 @@
 
         * mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
         [!MAC_OSX] (select): Use mac_wait_next_event.
-        [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
-        Vexec_suffixes.
+        [!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to Vexec_suffixes.
         [!MAC_OSX] (select, run_mac_command): Change `#ifdef
         TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
         (mac_clear_font_name_table): Add extern.
@@ -148,21 +666,19 @@
         * macfns.c (mac_initialized): Remove extern.
         (stricmp): Put in #if 0.  All callers changed to use xstricmp in
         xfaces.c.
-        (strnicmp): Decrement `n' at the end of each loop, not the
-        beginning.
-        (check_mac): Use the term "Mac native windows" instead of "Mac
-        OS".
+        (strnicmp): Decrement `n' at the end of each loop, not the beginning.
+        (check_mac): Use the term "Mac native windows" instead of "Mac OS".
         (check_x_display_info, x_display_info_for_name): Sync with xfns.c.
         (mac_get_rdb_resource): New function (from w32reg.c).
         (x_get_string_resource): Use it.
         (install_window_handler): Add extern.
         (mac_window): New function.
-        (Fx_create_frame): Use it instead of make_mac_frame.  Set
-        parameter for Qfullscreen.  Call x_wm_set_size_hint.
+        (Fx_create_frame): Use it instead of make_mac_frame.
+        Set parameter for Qfullscreen.  Call x_wm_set_size_hint.
         (Fx_open_connection, Fx_close_connection): New defuns.
         (syms_of_macfns): Defsubr them.
-        (x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
-        kWindowNoUpdatesAttribute to the window attribute.
+        (x_create_tip_frame) [TARGET_API_MAC_CARBON]:
+        Add kWindowNoUpdatesAttribute to the window attribute.
         (x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
         (x_create_tip_frame): Don't call ShowWindow.
         (Fx_show_tip): Call ShowWindow.
@@ -171,8 +687,7 @@
         (mac_frame_parm_handlers): Set handlers for Qfullscreen.
         (syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
 
-        * macgui.h [!MAC_OSX]: Don't include Controls.h.  Include
-        Windows.h.
+        * macgui.h [!MAC_OSX]: Don't include Controls.h.  Include Windows.h.
         (Window): Typedef to WindowPtr and move outside `#if
         TARGET_API_MAC_CARBON'.
         (XSizeHints): New struct.
@@ -191,8 +706,12 @@
         (x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
         if the position is neither user-specified nor program-specified.
         (x_free_frame_resources): Free size_hints.
-        (x_wm_set_size_hint): Allocate size_hints if needed.  Set
-        size_hints.
+<<<<<<< ChangeLog
+        (x_wm_set_size_hint): Allocate size_hints if needed.
+        Set size_hints.
+=======
+        (x_wm_set_size_hint): Allocate size_hints if needed.  Set size_hints.
+>>>>>>> 1.4187
         (mac_clear_font_name_table): New function.
         (mac_do_list_fonts): Initialize font_name_table if needed.
         (x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
@@ -206,8 +725,7 @@
         (do_window_update): Add BeginUpdate/EndUpdate for the tooltip
         window.  Use UpdateControls.  Get the rectangle that should be
         updated and restrict the target of expose_frame to it.
-        (do_grow_window): Set minimum height/width according to
-        size_hints.
+        (do_grow_window): Set minimum height/width according to size_hints.
         (do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
         (do_zoom_window): Don't use x_set_window_size.
         [USE_CARBON_EVENTS] (mac_handle_window_event): New function.
@@ -219,10 +737,10 @@
         (XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
         Update mouse_region when mouse is moved.
         (make_mac_frame): Remove.
-        (make_mac_terminal_frame): Put in #ifdef MAC_OS8.  Initialize
-        mouse pointer shapes.  Change values of f->left_pos and
-        f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.  Don't
-        call ShowWindow.
+        (make_mac_terminal_frame): Put in #ifdef MAC_OS8.
+        Initialize mouse pointer shapes.  Change values of f->left_pos and
+        f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.
+        Don't call ShowWindow.
         (mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
         Vinvocation_name and Vsystem_name.
         (mac_make_rdb): New function (from w32term.c).
@@ -245,17 +763,21 @@
 
 2004-12-27  Richard M. Stallman  <rms@gnu.org>
 
-        * buffer.c (Fbuffer_disable_undo): Deleted (moved to simple.el).
+<<<<<<< ChangeLog
+        * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
+=======
+        * buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
+>>>>>>> 1.4187
         (syms_of_buffer): Don't defsubr it.
 
         * process.c (list_processes_1): Set undo_list instead
         of calling Fbuffer_disable_undo.
 
-        * xdisp.c (single_display_spec_string_p): Renamed from
+        * xdisp.c (single_display_spec_string_p): Rename from
         single_display_prop_string_p.
-        (single_display_spec_intangible_p): Renamed from
+        (single_display_spec_intangible_p): Rename from
         single_display_prop_intangible_p.
-        (handle_single_display_spec): Renamed from handle_single_display_prop.
+        (handle_single_display_spec): Rename from handle_single_display_prop.
         Rewritten to be easier to understand.
 
         Change in load-history format.  Functions now get (defun . NAME),
@@ -285,6 +807,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
@@ -335,7 +861,7 @@
 
         * alloc.c (Fgarbage_collect): Update call to truncate_undo_list.
         Call that at the very start.
-        (undo_limit, undo_strong_limit, undo_outer_limit): Moved to undo.c.
+        (undo_limit, undo_strong_limit, undo_outer_limit): Move to undo.c.
         (syms_of_alloc): Don't define undo-limit,
         undo-strong-limit and undo-outer-limit here.
 
@@ -370,8 +896,8 @@
 
 2004-12-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * macterm.c (endif, x_font_name_to_mac_font_name): Use
-        maccentraleurroman instead of maccentraleuropean
+        * macterm.c (endif, x_font_name_to_mac_font_name):
+        Use maccentraleurroman instead of maccentraleuropean
         (mac_c_string_match, mac_do_list_fonts): Speed up font search by
         quickly finding a specific font without needing regexps.
 
@@ -397,8 +923,8 @@
 
         * sysdep.c (select_alarm): Call SIGNAL_THREAD_CHECK.
 
-        * process.c (send_process_trap, sigchld_handler): Call
-        SIGNAL_THREAD_CHECK.
+        * process.c (send_process_trap, sigchld_handler):
+        Call SIGNAL_THREAD_CHECK.
 
         * data.c (arith_error): Call SIGNAL_THREAD_CHECK.
 
@@ -488,7 +1014,7 @@
 
         * alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
 
-2004-12-07  Stefan  <monnier@iro.umontreal.ca>
+2004-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (init_eval_once): Increase max_specpdl_size to 1000.
 
@@ -1641,7 +2167,7 @@
 
         * window.c (Fspecial_display_p): Doc fix.
 
-2004-10-15  Stefan  <monnier@iro.umontreal.ca>
+2004-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * doc.c (Fsubstitute_command_keys): Fix remap-handling.
         Don't ignore menus, because where-is-internal already does it for us.
diff --git a/src/alloc.c b/src/alloc.c
index eabbf5192f4..49fc69e7058 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -103,7 +103,7 @@ extern __malloc_size_t __malloc_extra_blocks;
    that the backend handles concurrent access to malloc within its own threads
    but Emacs code running in the main thread is not included in that control).
 
-   When UNBLOCK_INPUT is called, revoke_input_signal may be called.  If this
+   When UNBLOCK_INPUT is called, reinvoke_input_signal may be called.  If this
    happens in one of the backend threads we will have two threads that tries
    to run Emacs code at once, and the code is not prepared for that.
    To prevent that, we only call BLOCK/UNBLOCK from the main thread.  */
@@ -143,11 +143,11 @@ static __malloc_size_t bytes_used_when_full;
 
 #define MARK_STRING(S)          ((S)->size |= ARRAY_MARK_FLAG)
 #define UNMARK_STRING(S)        ((S)->size &= ~ARRAY_MARK_FLAG)
-#define STRING_MARKED_P(S)      ((S)->size & ARRAY_MARK_FLAG)
+#define STRING_MARKED_P(S)      (((S)->size & ARRAY_MARK_FLAG) != 0)
 
 #define VECTOR_MARK(V)          ((V)->size |= ARRAY_MARK_FLAG)
 #define VECTOR_UNMARK(V)        ((V)->size &= ~ARRAY_MARK_FLAG)
-#define VECTOR_MARKED_P(V)      ((V)->size & ARRAY_MARK_FLAG)
+#define VECTOR_MARKED_P(V)      (((V)->size & ARRAY_MARK_FLAG) != 0)
 
 /* Value is the number of bytes/chars of S, a pointer to a struct
    Lisp_String.  This must be used instead of STRING_BYTES (S) or
@@ -310,6 +310,7 @@ static void mark_glyph_matrix P_ ((struct glyph_matrix *));
 static void mark_face_cache P_ ((struct face_cache *));
 
 #ifdef HAVE_WINDOW_SYSTEM
+extern void mark_fringe_data P_ ((void));
 static void mark_image P_ ((struct image *));
 static void mark_image_cache P_ ((struct frame *));
 #endif /* HAVE_WINDOW_SYSTEM */
@@ -705,9 +706,14 @@ overrun_check_free (block)
                 val + osize,
                 XMALLOC_OVERRUN_CHECK_SIZE))
         abort ();
+#ifdef XMALLOC_CLEAR_FREE_MEMORY
+      val -= XMALLOC_OVERRUN_CHECK_SIZE;
+      memset (val, 0xff, osize + XMALLOC_OVERRUN_CHECK_SIZE*2);
+#else
       bzero (val + osize, XMALLOC_OVERRUN_CHECK_SIZE);
       val -= XMALLOC_OVERRUN_CHECK_SIZE;
       bzero (val, XMALLOC_OVERRUN_CHECK_SIZE);
+#endif
     }
 
   free (val);
@@ -1114,17 +1120,34 @@ allocate_buffer ()
 }
 
 
+#ifndef SYSTEM_MALLOC
+
+/* If we released our reserve (due to running out of memory),
+   and we have a fair amount free once again,
+   try to set aside another reserve in case we run out once more.
+
+   This is called when a relocatable block is freed in ralloc.c.  */
+
+void
+refill_memory_reserve ()
+{
+  if (spare_memory == 0)
+    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
+}
+
+
 /* Arranging to disable input signals while we're in malloc.
 
    This only works with GNU malloc.  To help out systems which can't
    use GNU malloc, all the calls to malloc, realloc, and free
    elsewhere in the code should be inside a BLOCK_INPUT/UNBLOCK_INPUT
-   pairs; unfortunately, we have no idea what C library functions
+   pair; unfortunately, we have no idea what C library functions
    might call malloc, so we can't really protect them unless you're
    using GNU malloc.  Fortunately, most of the major operating systems
    can use GNU malloc.  */
 
-#ifndef SYSTEM_MALLOC
+#ifndef SYNC_INPUT
+
 #ifndef DOUG_LEA_MALLOC
 extern void * (*__malloc_hook) P_ ((size_t));
 extern void * (*__realloc_hook) P_ ((void *, size_t));
@@ -1183,20 +1206,6 @@ emacs_blocked_free (ptr)
 }
 
 
-/* If we released our reserve (due to running out of memory),
-   and we have a fair amount free once again,
-   try to set aside another reserve in case we run out once more.
-
-   This is called when a relocatable block is freed in ralloc.c.  */
-
-void
-refill_memory_reserve ()
-{
-  if (spare_memory == 0)
-    spare_memory = (char *) malloc ((size_t) SPARE_MEMORY);
-}
-
-
 /* This function is the malloc hook that Emacs uses.  */
 
 static void *
@@ -1348,6 +1357,7 @@ uninterrupt_malloc ()
   __realloc_hook = emacs_blocked_realloc;
 }
 
+#endif /* not SYNC_INPUT */
 #endif /* not SYSTEM_MALLOC */
 
 
@@ -4684,7 +4694,7 @@ returns nil, because real GC can't be done.  */)
            turned off in that buffer.  Calling truncate_undo_list on
            Qt tends to return NULL, which effectively turns undo back on.
            So don't call truncate_undo_list if undo_list is Qt.  */
-        if (! EQ (nextb->undo_list, Qt))
+        if (! NILP (nextb->name) && ! EQ (nextb->undo_list, Qt))
           truncate_undo_list (nextb);
 
         /* Shrink buffer gaps, but skip indirect and dead buffers.  */
@@ -4797,6 +4807,10 @@ returns nil, because real GC can't be done.  */)
     }
   mark_backtrace ();
 
+#ifdef HAVE_WINDOW_SYSTEM
+  mark_fringe_data ();
+#endif
+
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
   mark_stack ();
 #endif
diff --git a/src/buffer.c b/src/buffer.c
index b3bcb68c281..ae390ba7500 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1952,6 +1952,7 @@ DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
        doc: /* Put BUFFER at the end of the list of all buffers.
 There it is the least likely candidate for `other-buffer' to return;
 thus, the least likely buffer for \\[switch-to-buffer] to select by default.
+You can specify a buffer name as BUFFER, or an actual buffer object.
 If BUFFER is nil or omitted, bury the current buffer.
 Also, if BUFFER is nil or omitted, remove the current buffer from the
 selected window if it is displayed there.  */)
@@ -5782,6 +5783,14 @@ An entry (nil PROPERTY VALUE BEG . END) indicates that a text property
 was modified between BEG and END.  PROPERTY is the property name,
 and VALUE is the old value.
 
+An entry (apply FUN-NAME . ARGS) means undo the change with
+\(apply FUN-NAME ARGS).
+
+An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo
+in the active region.  BEG and END is the range affected by this entry
+and DELTA is the number of bytes added or deleted in that range by
+this change.
+
 An entry (MARKER . DISTANCE) indicates that the marker MARKER
 was adjusted in position by the offset DISTANCE (an integer).
 
diff --git a/src/casefiddle.c b/src/casefiddle.c
index ae4888088bd..9af4015fbb3 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,5 +1,5 @@
 /* GNU Emacs case conversion functions.
-   Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004
+   Copyright (C) 1985,94,97,98,99, 2001, 2002, 2004, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -73,71 +73,38 @@ casify_object (flag, obj)
       if (STRINGP (obj))
         {
           int multibyte = STRING_MULTIBYTE (obj);
+          int n;
 
           obj = Fcopy_sequence (obj);
           len = SBYTES (obj);
 
-          /* Scan all single-byte characters from start of string.  */
-          for (i = 0; i < len;)
+          /* I counts bytes, and N counts chars.  */
+          for (i = n = 0; i < len; n++)
             {
+              int from_len = 1, to_len = 1;
+
               c = SREF (obj, i);
 
               if (multibyte && c >= 0x80)
-                /* A multibyte character can't be handled in this
-                   simple loop.  */
-                break;
+                c = STRING_CHAR_AND_LENGTH (SDATA (obj) + i, len -i, from_len);
               if (inword && flag != CASE_CAPITALIZE_UP)
                 c = DOWNCASE (c);
               else if (!UPPERCASEP (c)
                        && (!inword || flag != CASE_CAPITALIZE_UP))
                 c = UPCASE1 (c);
-              /* If this char won't fit in a single-byte string.
-                 fall out to the multibyte case.  */
-              if (multibyte ? ! ASCII_BYTE_P (c)
-                  : ! SINGLE_BYTE_CHAR_P (c))
-                break;
-
-              SSET (obj, i, c);
-              if ((int) flag >= (int) CASE_CAPITALIZE)
-                inword = SYNTAX (c) == Sword;
-              i++;
-            }
-
-          /* If we didn't do the whole string as single-byte,
-             scan the rest in a more complex way.  */
-          if (i < len)
-            {
-              /* The work is not yet finished because of a multibyte
-                 character just encountered.  */
-              int fromlen, j_byte = i;
-              char *buf;
-              int bufsize;
-              USE_SAFE_ALLOCA;
-
-              bufsize = (len - i) * MAX_MULTIBYTE_LENGTH + i;
-              SAFE_ALLOCA (buf, char *, bufsize);
-
-              /* Copy data already handled.  */
-              bcopy (SDATA (obj), buf, i);
-
-              /* From now on, I counts bytes.  */
-              while (i < len)
+              if (ASCII_BYTE_P (c) || (! multibyte && SINGLE_BYTE_CHAR_P (c)))
+                SSET (obj, i, c);
+              else
                 {
-                  c = STRING_CHAR_AND_LENGTH (SDATA (obj) + i,
-                                              len - i, fromlen);
-                  if (inword && flag != CASE_CAPITALIZE_UP)
-                    c = DOWNCASE (c);
-                  else if (!UPPERCASEP (c)
-                           && (!inword || flag != CASE_CAPITALIZE_UP))
-                    c = UPCASE1 (c);
-                  i += fromlen;
-                  j_byte += CHAR_STRING (c, buf + j_byte);
-                  if ((int) flag >= (int) CASE_CAPITALIZE)
-                    inword = SYNTAX (c) == Sword;
+                  to_len = CHAR_BYTES (c);
+                  if (from_len == to_len)
+                    CHAR_STRING (c, SDATA (obj) + i);
+                  else
+                    Faset (obj, make_number (n), make_number (c));
                 }
-              obj = make_multibyte_string (buf, SCHARS (obj),
-                                           j_byte);
-              SAFE_FREE ();
+              if ((int) flag >= (int) CASE_CAPITALIZE)
+                inword = SYNTAX (c) == Sword;
+              i += to_len;
             }
           return obj;
         }
@@ -253,7 +220,7 @@ casify_region (flag, b, e)
       int opoint_byte = PT_BYTE;
       int c2;
 
-      while (i < end_byte)
+      while (start < end)
         {
           if ((c = FETCH_BYTE (i)) >= 0x80)
             c = FETCH_MULTIBYTE_CHAR (i);
@@ -281,12 +248,16 @@ casify_region (flag, b, e)
                     FETCH_BYTE (i + j) = str[j];
                 }
               else
-                /* Replace one character with the other,
-                   keeping text properties the same.  */
-                replace_range_2 (start + 1, i + tolen,
-                                 start + 2, i + tolen + fromlen,
-                                 str, 1, tolen,
-                                 0);
+                {
+                  /* Replace one character with the other,
+                     keeping text properties the same.  */
+                  replace_range_2 (start, i,
+                                   start + 1, i + fromlen,
+                                   str, 1, tolen,
+                                   1);
+                  if (opoint > start)
+                    opoint_byte += tolen - fromlen;
+                }
             }
           if ((int) flag >= (int) CASE_CAPITALIZE)
             inword = SYNTAX (c2) == Sword;
diff --git a/src/casetab.c b/src/casetab.c
index 6fc2d415fde..5ba025e2b5a 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Written by Howard Gayle.  See chartab.c for details. */
+/* Written by Howard Gayle.  */
 
 #include <config.h>
 #include "lisp.h"
diff --git a/src/coding.c b/src/coding.c
index a4adf767f36..11a7061c837 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2204,6 +2204,8 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
         DECODE_COMPOSITION_END ('1');
       src = src_base;
       c = *src++;
+      if (! NILP (translation_table))
+        c = translate_char (translation_table, c, 0, 0, 0);
       EMIT_CHAR (c);
     }
 
diff --git a/src/config.in b/src/config.in
index a7b29aac1c9..d3dab7ffab6 100644
--- a/src/config.in
+++ b/src/config.in
@@ -598,6 +598,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
+
 /* Define to 1 if you have the <sys/vlimit.h> header file. */
 #undef HAVE_SYS_VLIMIT_H
 
diff --git a/src/dispextern.h b/src/dispextern.h
index b7dcfb799d0..84fff3f0b09 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,5 +1,5 @@
 /* Interface definitions for display code.
-   Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004
+   Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004, 2005
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -123,12 +123,13 @@ enum window_part
 
 #if GLYPH_DEBUG
 #define IF_DEBUG(X)     X
-#define xassert(X)      do {if (!(X)) abort ();} while (0)
 #else
 #define IF_DEBUG(X)     (void) 0
-#define xassert(X)      (void) 0
 #endif
 
+/* Maybe move this inside the above `#ifdef GLYPH_DEBUG' for release.  */
+#define xassert(X)      do {if (!(X)) abort ();} while (0)
+
 /* Macro for displaying traces of redisplay.  If Emacs was compiled
    with GLYPH_DEBUG != 0, the variable trace_redisplay_p can be set to
    a non-zero value in debugging sessions to activate traces.  */
@@ -817,6 +818,9 @@ struct glyph_row
   /* 1 means this row currently shows the cursor in the right fringe.  */
   unsigned cursor_in_fringe_p : 1;
 
+  /* 1 means the last glyph in the row is part of an ellipsis.  */
+  unsigned ends_in_ellipsis_p : 1;
+
   /* Non-zero means display a bitmap on X frames indicating that this
      the first line of the buffer.  */
   unsigned indicate_bob_p : 1;
@@ -1185,6 +1189,11 @@ struct glyph_string
   /* Slice */
   struct glyph_slice slice;
 
+  /* Non-null means the horizontal clipping region starts from the
+     left edge of *clip_head, and ends with the right edge of
+     *clip_tail, not including their overhangs.  */
+  struct glyph_string *clip_head, *clip_tail;
+
   struct glyph_string *next, *prev;
 };
 
@@ -1820,6 +1829,10 @@ struct it
      Don't handle some `display' properties in these strings.  */
   unsigned string_from_display_prop_p : 1;
 
+  /* When METHOD == next_element_from_display_vector,
+     this is 1 if we're doing an ellipsis.  Otherwise meaningless.  */
+  unsigned ellipsis_p : 1;
+
   /* Display table in effect or null for none.  */
   struct Lisp_Char_Table *dp;
 
@@ -1835,6 +1848,9 @@ struct it
      means that no such character is involved.  */
   int dpvec_char_len;
 
+  /* Face id to use for all characters in display vector.  -1 if unused. */
+  int dpvec_face_id;
+
   /* Face id of the iterator saved in case a glyph from dpvec contains
      a face.  The face is restored when all glyphs from dpvec have
      been delivered.  */
@@ -2620,6 +2636,8 @@ extern void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *,
 extern void draw_phys_cursor_glyph P_ ((struct window *,
                                           struct glyph_row *,
                                           enum draw_glyphs_face));
+extern int get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *,
+                                         struct glyph *, int *));
 extern void erase_phys_cursor P_ ((struct window *));
 extern void display_and_set_cursor P_ ((struct window *,
                                           int, int, int, int, int));
@@ -2741,6 +2759,7 @@ int face_at_buffer_position P_ ((struct window *, int, int, int, int *,
                                  int, int));
 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
                                  int, int *, enum face_id, int));
+int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
 int compute_char_face P_ ((struct frame *, int, Lisp_Object));
 void free_all_realized_faces P_ ((Lisp_Object));
 extern Lisp_Object Qforeground_color, Qbackground_color;
diff --git a/src/dispnew.c b/src/dispnew.c
index 6813cda5a71..3fef2af7429 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4064,19 +4064,19 @@ update_window (w, force_p)
   int preempt_count = baud_rate / 2400 + 1;
   extern int input_pending;
   extern Lisp_Object do_mouse_tracking;
+  struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 #if GLYPH_DEBUG
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-#endif
-  struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 
   /* Check that W's frame doesn't have glyph matrices.  */
   xassert (FRAME_WINDOW_P (f));
+#endif
 
   /* Check pending input the first time so that we can quickly return.  */
   if (redisplay_dont_pause)
     force_p = 1;
   else
-    detect_input_pending ();
+    detect_input_pending_ignore_squeezables ();
 
   /* If forced to complete the update, or if no input is pending, do
      the update.  */
@@ -4150,7 +4150,7 @@ update_window (w, force_p)
                scrolling large windows with repeated scroll-up
                commands will too quickly pause redisplay.  */
             if (!force_p && ++n_updated % preempt_count == 0)
-              detect_input_pending ();
+              detect_input_pending_ignore_squeezables ();
 
             changed_p |= update_window_line (w, vpos,
                                              &mouse_face_overwritten_p);
@@ -5099,7 +5099,7 @@ update_frame_1 (f, force_p, inhibit_id_p)
 
   if (redisplay_dont_pause)
     force_p = 1;
-  else if (!force_p && detect_input_pending ())
+  else if (!force_p && detect_input_pending_ignore_squeezables ())
     {
       pause = 1;
       goto do_pause;
@@ -5155,7 +5155,7 @@ update_frame_1 (f, force_p, inhibit_id_p)
             }
 
           if ((i - 1) % preempt_count == 0)
-            detect_input_pending ();
+            detect_input_pending_ignore_squeezables ();
 
           update_frame_line (f, i);
         }
@@ -5851,7 +5851,7 @@ mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height)
          it's the one we were looking for.  */
       glyph = row->glyphs[TEXT_AREA];
       end = glyph + row->used[TEXT_AREA];
-      for (x0 = *x; glyph < end && x0 > glyph->pixel_width; ++glyph)
+      for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph)
         x0 -= glyph->pixel_width;
       *x = glyph - row->glyphs[TEXT_AREA];
       if (glyph < end)
@@ -5943,7 +5943,7 @@ marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height)
 
       glyph = row->glyphs[area];
       end = glyph + row->used[area];
-      for (x0 = *x - x0; glyph < end && x0 > glyph->pixel_width; ++glyph)
+      for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph)
         x0 -= glyph->pixel_width;
       *x = glyph - row->glyphs[area];
       if (glyph < end)
diff --git a/src/editfns.c b/src/editfns.c
index 45b7caa280b..0587d66bb0f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -34,6 +34,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
 /* systime.h includes <sys/time.h> which, on some systems, is required
    for <sys/resource.h>; thus systime.h must be included before
    <sys/resource.h> */
@@ -106,6 +110,7 @@ Lisp_Object Vsystem_name;
 Lisp_Object Vuser_real_login_name;      /* login name of current user ID */
 Lisp_Object Vuser_full_name;            /* full name of current user */
 Lisp_Object Vuser_login_name;           /* user name from LOGNAME or USER */
+Lisp_Object Voperating_system_release;  /* Operating System Release */
 
 /* Symbol for the text property used to mark fields.  */
 
@@ -170,6 +175,16 @@ init_editfns ()
     Vuser_full_name = build_string (p);
   else if (NILP (Vuser_full_name))
     Vuser_full_name = build_string ("unknown");
+
+#ifdef HAVE_SYS_UTSNAME_H
+  {
+    struct utsname uts;
+    uname (&uts);
+    Voperating_system_release = build_string (uts.release);
+  }
+#else
+  Voperating_system_release = Qnil;
+#endif
 }
 
 DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
@@ -1349,6 +1364,15 @@ get_system_name ()
     return "";
 }
 
+char *
+get_operating_system_release()
+{
+  if (STRINGP (Voperating_system_release))
+    return (char *) SDATA (Voperating_system_release);
+  else
+    return "";
+}
+
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as an integer.  */)
      ()
@@ -3111,7 +3135,7 @@ usage: (message STRING &rest ARGS)  */)
           && SBYTES (args[0]) == 0))
     {
       message (0);
-      return Qnil;
+      return args[0];
     }
   else
     {
@@ -4293,6 +4317,9 @@ functions if all the text being accessed has this property.  */);
   DEFVAR_LISP ("user-real-login-name", &Vuser_real_login_name,
                doc: /* The user's name, based upon the real uid only.  */);
 
+  DEFVAR_LISP ("operating-system-release", &Voperating_system_release,
+               doc: /* The release of the operating system Emacs is running on.  */);
+
   defsubr (&Spropertize);
   defsubr (&Schar_equal);
   defsubr (&Sgoto_char);
diff --git a/src/emacs.c b/src/emacs.c
index cbe386d3296..d5ae652d6ee 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
-   Copyright (C) 1985,86,87,93,94,95,97,98,1999,2001,02,03,2004
-      Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2429,7 +2429,16 @@ syms_of_emacs ()
 Many arguments are deleted from the list as they are processed.  */);
 
   DEFVAR_LISP ("system-type", &Vsystem_type,
-               doc: /* Value is symbol indicating type of operating system you are using.  */);
++              doc: /* Value is symbol indicating type of operating system you are using.
++Special values:
++  `gnu/linux'   compiled for a GNU/Linux system.
++  `darwin'      compiled for Darwin (GNU-Darwin, Mac OS X, ...).
++  `macos'       compiled for Mac OS 9.
++  `ms-dos'      compiled as an MS-DOS application.
++  `windows-nt'  compiled as a native W32 application.
++  `cygwin'      compiled using the Cygwin library.
++  `vax-vms' or `axp-vms': compiled for a (Open)VMS system.
++Anything else indicates some sort of Unix system.  */);
   Vsystem_type = intern (SYSTEM_TYPE);
 
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
diff --git a/src/fileio.c b/src/fileio.c
index 1943a186316..12360c677f8 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2392,10 +2392,10 @@ Signals a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
-Fourth arg KEEP-TIME non-nil means give the new file the same
+Always sets the file modes of the output file to match the input file.
+Fourth arg KEEP-TIME non-nil means give the output file the same
 last-modified time as the old one.  (This works on only some systems.)
-A prefix arg makes KEEP-TIME non-nil.
-Also set the file modes of the target file to match the source file.  */)
+A prefix arg makes KEEP-TIME non-nil.  */)
      (file, newname, ok_if_already_exists, keep_time)
      Lisp_Object file, newname, ok_if_already_exists, keep_time;
 {
diff --git a/src/fns.c b/src/fns.c
index b163223803c..9a3121a3391 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3443,6 +3443,10 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
 
   CHECK_SYMBOL (feature);
 
+  /* Record the presence of `require' in this file
+     even if the feature specified is already loaded.  */
+  LOADHIST_ATTACH (Fcons (Qrequire, feature));
+
   tem = Fmemq (feature, Vfeatures);
 
   if (NILP (tem))
@@ -3450,8 +3454,6 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
       int count = SPECPDL_INDEX ();
       int nesting = 0;
 
-      LOADHIST_ATTACH (Fcons (Qrequire, feature));
-
       /* This is to make sure that loadup.el gives a clear picture
          of what files are preloaded and when.  */
       if (! NILP (Vpurify_flag))
@@ -4834,6 +4836,10 @@ sweep_weak_table (h, remove_entries_p)
 
                   h->count = make_number (XFASTINT (h->count) - 1);
                 }
+              else
+                {
+                  prev = idx;
+                }
             }
           else
             {
diff --git a/src/fringe.c b/src/fringe.c
index d08f0ea4535..5344d58737e 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -447,7 +447,7 @@ struct fringe_bitmap standard_bitmaps[MAX_STANDARD_FRINGE_BITMAPS] =
 };
 
 static struct fringe_bitmap **fringe_bitmaps;
-static unsigned *fringe_faces;
+static Lisp_Object *fringe_faces;
 static int max_fringe_bitmaps;
 
 static int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;
@@ -548,7 +548,13 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which)
     }
 
   if (face_id == DEFAULT_FACE_ID)
-    face_id = fringe_faces[which];
+    {
+      Lisp_Object face;
+
+      if ((face = fringe_faces[which], NILP (face))
+          || (face_id = lookup_named_face (f, face, 'A', 1), face_id < 0))
+        face_id = FRINGE_FACE_ID;
+    }
 
   fb = fringe_bitmaps[which];
   if (fb == NULL)
@@ -575,7 +581,8 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which)
 
   if (p.face == NULL)
     {
-      /* Why does this happen?  ++kfs */
+      /* This could happen after clearing face cache.
+         But it shouldn't happen anymore.  ++kfs */
       return;
     }
 
@@ -1074,7 +1081,7 @@ destroy_fringe_bitmap (n)
 {
   struct fringe_bitmap **fbp;
 
-  fringe_faces[n] = FRINGE_FACE_ID;
+  fringe_faces[n] = Qnil;
 
   fbp = &fringe_bitmaps[n];
   if (*fbp && (*fbp)->dynamic)
@@ -1300,12 +1307,12 @@ If BITMAP already exists, the existing definition is replaced.  */)
                 = ((struct fringe_bitmap **)
                    xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *)));
               fringe_faces
-                = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (unsigned));
+                = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
 
               for (; i < max_fringe_bitmaps; i++)
                 {
                   fringe_bitmaps[i] = NULL;
-                  fringe_faces[i] = FRINGE_FACE_ID;
+                  fringe_faces[i] = Qnil;
                 }
             }
         }
@@ -1363,10 +1370,8 @@ If FACE is nil, reset face to default fringe face.  */)
       if (face_id < 0)
         error ("No such face");
     }
-  else
-    face_id = FRINGE_FACE_ID;
 
-  fringe_faces[n] = face_id;
+  fringe_faces[n] = face;
 
   return Qnil;
 }
@@ -1440,6 +1445,18 @@ You must (require 'fringe) to use fringe bitmap symbols in your programs." */);
   Vfringe_bitmaps = Qnil;
 }
 
+/* Garbage collection hook */
+
+void
+mark_fringe_data ()
+{
+  int i;
+
+  for (i = 0; i < max_fringe_bitmaps; i++)
+    if (!NILP (fringe_faces[i]))
+      mark_object (fringe_faces[i]);
+}
+
 /* Initialize this module when Emacs starts.  */
 
 void
@@ -1461,12 +1478,12 @@ init_fringe ()
   fringe_bitmaps
     = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
   fringe_faces
-    = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (unsigned));
+    = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
 
   for (i = 0; i < max_fringe_bitmaps; i++)
     {
       fringe_bitmaps[i] = NULL;
-      fringe_faces[i] = FRINGE_FACE_ID;
+      fringe_faces[i] = Qnil;
     }
 }
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 22919230a65..aecc4e2eaea 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -756,7 +756,7 @@ xg_create_frame_widgets (f)
      So we cheat a bit by setting a height that is what it will have
      later on when tool bar items are added.  */
   if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0)
-    FRAME_TOOLBAR_HEIGHT (f) = 34;
+    FRAME_TOOLBAR_HEIGHT (f) = 38;
 
 
   /* We don't want this widget double buffered, because we draw on it
@@ -1312,6 +1312,7 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
   char *fn = 0;
   int filesel_done = 0;
   xg_get_file_func func;
+  extern int x_use_old_gtk_file_dialog;
 
 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
   /* I really don't know why this is needed, but without this the GLIBC add on
@@ -1321,7 +1322,6 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
 #endif /* HAVE_GTK_AND_PTHREAD */
 
 #ifdef HAVE_GTK_FILE_BOTH
-  extern int x_use_old_gtk_file_dialog;
 
   if (x_use_old_gtk_file_dialog)
     w = xg_get_file_with_selection (f, prompt, default_filename,
@@ -2850,7 +2850,7 @@ xg_gtk_scroll_destroy (widget, data)
      gpointer data;
 {
   gpointer p;
-  int id = (int)data;
+  int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */
 
   p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA);
   if (p) xfree (p);
@@ -2920,10 +2920,11 @@ xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name)
                     "value-changed",
                     scroll_callback,
                     (gpointer) bar);
+  /* The EMACS_INT cast avoids a warning. */
   g_signal_connect (G_OBJECT (wscroll),
                     "destroy",
                     G_CALLBACK (xg_gtk_scroll_destroy),
-                    (gpointer) scroll_id);
+                    (gpointer) (EMACS_INT) scroll_id);
 
   /* Connect to button press and button release to detect if any scroll bar
      has the pointer.  */
@@ -3112,7 +3113,8 @@ xg_tool_bar_callback (w, client_data)
      GtkWidget *w;
      gpointer client_data;
 {
-  int idx = (int)client_data;
+  /* The EMACS_INT cast avoids a warning. */
+  int idx = (int) (EMACS_INT) client_data;
   FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
   Lisp_Object key, frame;
   struct input_event event;
@@ -3154,10 +3156,11 @@ xg_tool_bar_detach_callback (wbox, w, client_data)
 
   if (f)
     {
+      FRAME_X_OUTPUT (f)->toolbar_detached = 1;
+
       /* When detaching a tool bar, not everything dissapear.  There are
          a few pixels left that are used to drop the tool bar back into
          place.  */
-      int bw = gtk_container_get_border_width (GTK_CONTAINER (wbox));
       FRAME_TOOLBAR_HEIGHT (f) = 2;
 
       /* The height has changed, resize outer widget and set columns
@@ -3185,11 +3188,13 @@ xg_tool_bar_attach_callback (wbox, w, client_data)
     {
       GtkRequisition req;
 
+      FRAME_X_OUTPUT (f)->toolbar_detached = 0;
+
       gtk_widget_size_request (w, &req);
       FRAME_TOOLBAR_HEIGHT (f) = req.height;
 
       /* The height has changed, resize outer widget and set columns
-         rows to what we had before detaching the tool bar.  */
+         rows to what we had before attaching the tool bar.  */
       xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
     }
 }
@@ -3209,7 +3214,8 @@ xg_tool_bar_help_callback (w, event, client_data)
      GdkEventCrossing *event;
      gpointer client_data;
 {
-  int idx = (int)client_data;
+  /* The EMACS_INT cast avoids a warning. */
+  int idx = (int) (EMACS_INT) client_data;
   FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
   Lisp_Object help, frame;
 
@@ -3302,6 +3308,8 @@ xg_create_tool_bar (f)
 
   x->toolbar_widget = gtk_toolbar_new ();
   x->handlebox_widget = gtk_handle_box_new ();
+  x->toolbar_detached = 0;
+
   gtk_container_add (GTK_CONTAINER (x->handlebox_widget),
                      x->toolbar_widget);
 
@@ -3452,11 +3460,12 @@ update_frame_tool_bar (f)
 
           gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
 
+          /* The EMACS_INT cast avoids a warning. */
           gtk_toolbar_append_item (GTK_TOOLBAR (x->toolbar_widget),
                                    0, 0, 0,
                                    w,
                                    GTK_SIGNAL_FUNC (xg_tool_bar_callback),
-                                   (gpointer)i);
+                                   (gpointer) (EMACS_INT) i);
 
           /* Save the image so we can see if an update is needed when
              this function is called again.  */
@@ -3486,14 +3495,15 @@ update_frame_tool_bar (f)
                  rather than the GtkButton specific signals "enter" and
                  "leave", so we can have only one callback.  The event
                  will tell us what kind of event it is.  */
+              /* The EMACS_INT cast avoids a warning. */
               g_signal_connect (G_OBJECT (w),
                                 "enter-notify-event",
                                 G_CALLBACK (xg_tool_bar_help_callback),
-                                (gpointer)i);
+                                (gpointer) (EMACS_INT) i);
               g_signal_connect (G_OBJECT (w),
                                 "leave-notify-event",
                                 G_CALLBACK (xg_tool_bar_help_callback),
-                                (gpointer)i);
+                                (gpointer) (EMACS_INT) i);
             }
         }
       else
@@ -3532,7 +3542,8 @@ update_frame_tool_bar (f)
     }
 
   gtk_widget_size_request (x->toolbar_widget, &new_req);
-  if (old_req.height != new_req.height)
+  if (old_req.height != new_req.height
+      && ! FRAME_X_OUTPUT (f)->toolbar_detached)
     {
       FRAME_TOOLBAR_HEIGHT (f) = new_req.height;
       xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f));
diff --git a/src/indent.c b/src/indent.c
index 7cfe53d80bb..39602c60d16 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1,6 +1,6 @@
 /* Indentation functions.
-   Copyright (C) 1985,86,87,88,93,94,95,98,2000,01,02,03,2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -342,7 +342,9 @@ will have a variable width)
 Ignores finite width of frame, which means that this function may return
 values greater than (frame-width).
 Whether the line is visible (if `selective-display' is t) has no effect;
-however, ^M is treated as end of line when `selective-display' is t.  */)
+however, ^M is treated as end of line when `selective-display' is t.
+Text that has an invisible property is considered as having width 0, unless
+`buffer-invisibility-spec' specifies that it is replaced by an ellipsis.  */)
      ()
 {
   Lisp_Object temp;
@@ -2073,6 +2075,7 @@ whether or not it is currently displayed in some window.  */)
   else
     {
       int it_start;
+      int oselective;
 
       SET_TEXT_POS (pt, PT, PT_BYTE);
       start_display (&it, w, pt);
@@ -2086,7 +2089,11 @@ whether or not it is currently displayed in some window.  */)
       it_start = IT_CHARPOS (it);
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;
+      /* Temporarily disable selective display so we don't move too far */
+      oselective = it.selective;
+      it.selective = 0;
       move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
+      it.selective = oselective;
 
       /* Move back if we got too far.  This may happen if
          truncate-lines is on and PT is beyond right margin.  */
diff --git a/src/insdel.c b/src/insdel.c
index 7f10c2f523d..ad6623c6693 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1,5 +1,5 @@
 /* Buffer insertion/deletion and gap motion for GNU Emacs.
-   Copyright (C) 1985, 86,93,94,95,97,98, 1999, 2000, 01, 2003
+   Copyright (C) 1985, 86,93,94,95,97,98, 1999, 2000, 01, 2003, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1745,17 +1745,21 @@ replace_range_2 (from, from_byte, to, to_byte, ins, inschars, insbytes, markers)
 
   /* Adjust markers for the deletion and the insertion.  */
   if (markers
-      && ! (nchars_del == 1 && inschars == 1))
+      && ! (nchars_del == 1 && inschars == 1 && nbytes_del == insbytes))
     adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
                                 inschars, insbytes);
 
   offset_intervals (current_buffer, from, inschars - nchars_del);
 
   /* Relocate point as if it were a marker.  */
-  if (from < PT && nchars_del != inschars)
-    adjust_point ((from + inschars - (PT < to ? PT : to)),
-                  (from_byte + insbytes
-                   - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));
+  if (from < PT && (nchars_del != inschars || nbytes_del != insbytes))
+    {
+      if (PT < to)
+        /* PT was within the deleted text.  Move it to FROM.  */
+        adjust_point (from - PT, from_byte - PT_BYTE);
+      else
+        adjust_point (inschars - nchars_del, insbytes - nbytes_del);
+    }
 
   if (insbytes == 0)
     evaporate_overlays (from);
diff --git a/src/keyboard.c b/src/keyboard.c
index 5c2fbf29cae..5e0ffb14942 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -634,14 +634,17 @@ static EMACS_TIME timer_last_idleness_start_time;
 
 /* Global variable declarations.  */
 
+/* Flags for readable_events.  */
+#define READABLE_EVENTS_DO_TIMERS_NOW           (1 << 0)
+#define READABLE_EVENTS_FILTER_EVENTS           (1 << 1)
+#define READABLE_EVENTS_IGNORE_SQUEEZABLES      (1 << 2)
+
 /* Function for init_keyboard to call with no args (if nonzero).  */
 void (*keyboard_init_hook) ();
 
 static int read_avail_input P_ ((int));
 static void get_input_pending P_ ((int *, int));
-static void get_filtered_input_pending P_ ((int *, int, int));
 static int readable_events P_ ((int));
-static int readable_filtered_events P_ ((int, int));
 static Lisp_Object read_char_x_menu_prompt P_ ((int, Lisp_Object *,
                                                 Lisp_Object, int *));
 static Lisp_Object read_char_x_menu_prompt ();
@@ -3435,10 +3438,11 @@ tracking_off (old_value)
          input has been processed.  If the only input available was
          the sort that we have just disabled, then we need to call
          redisplay.  */
-      if (!readable_events (1))
+      if (!readable_events (READABLE_EVENTS_DO_TIMERS_NOW))
         {
           redisplay_preserve_echo_area (6);
-          get_input_pending (&input_pending, 1);
+          get_input_pending (&input_pending,
+                             READABLE_EVENTS_DO_TIMERS_NOW);
         }
     }
   return Qnil;
@@ -3490,20 +3494,19 @@ some_mouse_moved ()
 /* Return true iff there are any events in the queue that read-char
    would return.  If this returns false, a read-char would block.  */
 static int
-readable_filtered_events (do_timers_now, filter_events)
-     int do_timers_now;
-     int filter_events;
+readable_events (flags)
+     int flags;
 {
-  if (do_timers_now)
-    timer_check (do_timers_now);
+  if (flags & READABLE_EVENTS_DO_TIMERS_NOW)
+    timer_check (1);
 
-  /* If the buffer contains only FOCUS_IN_EVENT events,
-     and FILTER_EVENTS is nonzero, report it as empty.  */
+  /* If the buffer contains only FOCUS_IN_EVENT events, and
+     READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
   if (kbd_fetch_ptr != kbd_store_ptr)
     {
       int have_live_event = 1;
 
-      if (filter_events)
+      if (flags & READABLE_EVENTS_FILTER_EVENTS)
         {
           struct input_event *event;
 
@@ -3524,7 +3527,8 @@ readable_filtered_events (do_timers_now, filter_events)
     }
 
 #ifdef HAVE_MOUSE
-  if (!NILP (do_mouse_tracking) && some_mouse_moved ())
+  if (!(flags & READABLE_EVENTS_IGNORE_SQUEEZABLES)
+      && !NILP (do_mouse_tracking) && some_mouse_moved ())
     return 1;
 #endif
   if (single_kboard)
@@ -3542,15 +3546,6 @@ readable_filtered_events (do_timers_now, filter_events)
   return 0;
 }
 
-/* Return true iff there are any events in the queue that read-char
-   would return.  If this returns false, a read-char would block.  */
-static int
-readable_events (do_timers_now)
-     int do_timers_now;
-{
-  return readable_filtered_events (do_timers_now, 0);
-}
-
 /* Set this for debugging, to have a way to get out */
 int stop_character;
 
@@ -4225,7 +4220,7 @@ swallow_events (do_display)
     }
 
   old_timers_run = timers_run;
-  get_input_pending (&input_pending, 1);
+  get_input_pending (&input_pending, READABLE_EVENTS_DO_TIMERS_NOW);
 
   if (timers_run != old_timers_run && do_display)
     redisplay_preserve_echo_area (7);
@@ -6517,18 +6512,20 @@ lucid_event_type_list_p (object)
    but works even if FIONREAD does not exist.
    (In fact, this may actually read some input.)
 
-   If DO_TIMERS_NOW is nonzero, actually run timer events that are ripe.
-   If FILTER_EVENTS is nonzero, ignore internal events (FOCUS_IN_EVENT). */
+   If READABLE_EVENTS_DO_TIMERS_NOW is set in FLAGS, actually run
+   timer events that are ripe.
+   If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal
+   events (FOCUS_IN_EVENT).
+   If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse
+   movements. */
 
 static void
-get_filtered_input_pending (addr, do_timers_now, filter_events)
+get_input_pending (addr, flags)
      int *addr;
-     int do_timers_now;
-     int filter_events;
+     int flags;
 {
   /* First of all, have we already counted some input?  */
-  *addr = (!NILP (Vquit_flag)
-           || readable_filtered_events (do_timers_now, filter_events));
+  *addr = (!NILP (Vquit_flag) || readable_events (flags));
 
   /* If input is being read as it arrives, and we have none, there is none.  */
   if (*addr > 0 || (interrupt_input && ! interrupts_deferred))
@@ -6536,23 +6533,7 @@ get_filtered_input_pending (addr, do_timers_now, filter_events)
 
   /* Try to read some input and see how much we get.  */
   gobble_input (0);
-  *addr = (!NILP (Vquit_flag)
-           || readable_filtered_events (do_timers_now, filter_events));
-}
-
-/* Store into *addr a value nonzero if terminal input chars are available.
-   Serves the purpose of ioctl (0, FIONREAD, addr)
-   but works even if FIONREAD does not exist.
-   (In fact, this may actually read some input.)
-
-   If DO_TIMERS_NOW is nonzero, actually run timer events that are ripe.  */
-
-static void
-get_input_pending (addr, do_timers_now)
-     int *addr;
-     int do_timers_now;
-{
-  get_filtered_input_pending (addr, do_timers_now, 0);
+  *addr = (!NILP (Vquit_flag) || readable_events (flags));
 }
 
 /* Interface to read_avail_input, blocking SIGIO or SIGALRM if necessary.  */
@@ -6915,7 +6896,7 @@ input_available_signal (signo)
 #else
   SIGNAL_THREAD_CHECK (signo);
 #endif
-  
+
   if (input_available_clear_time)
     EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
 
@@ -9940,6 +9921,18 @@ detect_input_pending ()
   return input_pending;
 }
 
+/* Return nonzero if input events other than mouse movements are
+   pending.  */
+
+int
+detect_input_pending_ignore_squeezables ()
+{
+  if (!input_pending)
+    get_input_pending (&input_pending, READABLE_EVENTS_IGNORE_SQUEEZABLES);
+
+  return input_pending;
+}
+
 /* Return nonzero if input events are pending, and run any pending timers.  */
 
 int
@@ -9949,7 +9942,7 @@ detect_input_pending_run_timers (do_display)
   int old_timers_run = timers_run;
 
   if (!input_pending)
-    get_input_pending (&input_pending, 1);
+    get_input_pending (&input_pending, READABLE_EVENTS_DO_TIMERS_NOW);
 
   if (old_timers_run != timers_run && do_display)
     {
@@ -10002,7 +9995,9 @@ if there is a doubt, the value is t.  */)
   if (!NILP (Vunread_command_events) || unread_command_char != -1)
     return (Qt);
 
-  get_filtered_input_pending (&input_pending, 1, 1);
+  get_input_pending (&input_pending,
+                     READABLE_EVENTS_DO_TIMERS_NOW
+                     | READABLE_EVENTS_FILTER_EVENTS);
   return input_pending > 0 ? Qt : Qnil;
 }
 
@@ -10644,17 +10639,19 @@ The elements of this list correspond to the arguments of
   return Flist (sizeof (val) / sizeof (val[0]), val);
 }
 
-DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 3, 0,
+DEFUN ("posn-at-x-y", Fposn_at_x_y, Sposn_at_x_y, 2, 4, 0,
        doc: /* Return position information for pixel coordinates X and Y.
 By default, X and Y are relative to text area of the selected window.
 Optional third arg FRAME_OR_WINDOW non-nil specifies frame or window.
+If optional fourth arg WHOLE is non-nil, X is relative to the left
+edge of the window.
 
 The return value is similar to a mouse click position:
    (WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
     IMAGE (DX . DY) (WIDTH . HEIGHT))
 The `posn-' functions access elements of such lists.  */)
-  (x, y, frame_or_window)
-     Lisp_Object x, y, frame_or_window;
+  (x, y, frame_or_window, whole)
+     Lisp_Object x, y, frame_or_window, whole;
 {
   if (NILP (frame_or_window))
     frame_or_window = selected_window;
@@ -10667,7 +10664,10 @@ The `posn-' functions access elements of such lists.  */)
 
       w = XWINDOW (frame_or_window);
       XSETINT (x, (WINDOW_TO_FRAME_PIXEL_X (w, XINT (x))
-                   + window_box_left_offset (w, TEXT_AREA)));
+                   + (NILP (whole)
+                      ? window_box_left_offset (w, TEXT_AREA)
+                      : - (WINDOW_LEFT_SCROLL_BAR_COLS (w)
+                           * WINDOW_FRAME_COLUMN_WIDTH (w)))));
       XSETINT (y, WINDOW_TO_FRAME_PIXEL_Y (w, XINT (y)));
       frame_or_window = w->frame;
     }
@@ -10695,7 +10695,7 @@ The `posn-' functions access elements of such lists.  */)
 
   tem = Fpos_visible_in_window_p (pos, window, Qt);
   if (!NILP (tem))
-    tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window);
+    tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window, Qnil);
   return tem;
 }
 
@@ -11401,14 +11401,15 @@ The elements of the list are event types that may have menu bar bindings.  */);
                  doc: /* Per-terminal keymap that overrides all other local keymaps.
 If this variable is non-nil, it is used as a keymap instead of the
 buffer's local map, and the minor mode keymaps and text property keymaps.
-It also overrides `overriding-local-map'.
+It also replaces `overriding-local-map'.
+
 This variable is intended to let commands such as `universal-argument'
 set up a different keymap for reading the next command.  */);
 
   DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map,
                doc: /* Keymap that overrides all other local keymaps.
-If this variable is non-nil, it is used as a keymap instead of the
-buffer's local map, and the minor mode keymaps and text property keymaps.  */);
+If this variable is non-nil, it is used as a keymap--replacing the
+buffer's local map, the minor mode keymaps, and char property keymaps.  */);
   Voverriding_local_map = Qnil;
 
   DEFVAR_LISP ("overriding-local-map-menu-flag", &Voverriding_local_map_menu_flag,
diff --git a/src/keymap.c b/src/keymap.c
index 4375b2e3a51..f28032d0f82 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,6 +1,6 @@
 /* Manipulation of keymaps
-   Copyright (C) 1985, 86,87,88,93,94,95,98,99, 2000, 01, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 1999, 2000,
+     2001, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -529,6 +529,10 @@ access_keymap (map, idx, t_ok, noinherit, autoload)
       struct gcpro gcpro1;
       Lisp_Object meta_map;
       GCPRO1 (map);
+      /* A strange value in which Meta is set would cause
+         infinite recursion.  Protect against that.  */
+      if (XINT (meta_prefix_char) & CHAR_META)
+        meta_prefix_char = make_number (27);
       meta_map = get_keymap (access_keymap (map, meta_prefix_char,
                                             t_ok, noinherit, autoload),
                              0, autoload);
@@ -1487,10 +1491,13 @@ OLP if non-nil indicates that we should obey `overriding-local-map' and
 
   if (!NILP (olp))
     {
-      if (!NILP (Voverriding_local_map))
-        keymaps = Fcons (Voverriding_local_map, keymaps);
       if (!NILP (current_kboard->Voverriding_terminal_local_map))
         keymaps = Fcons (current_kboard->Voverriding_terminal_local_map, keymaps);
+      /* The doc said that overriding-terminal-local-map should
+         override overriding-local-map.  The code used them both,
+         but it seems clearer to use just one.  rms, jan 2005.  */
+      else if (!NILP (Voverriding_local_map))
+        keymaps = Fcons (Voverriding_local_map, keymaps);
     }
   if (NILP (XCDR (keymaps)))
     {
@@ -1498,16 +1505,20 @@ OLP if non-nil indicates that we should obey `overriding-local-map' and
       Lisp_Object *maps;
       int nmaps, i;
 
+      /* This usually returns the buffer's local map,
+         but that can be overridden by a `local-map' property.  */
       local = get_local_map (PT, current_buffer, Qlocal_map);
       if (!NILP (local))
         keymaps = Fcons (local, keymaps);
 
+      /* Now put all the minor mode keymaps on the list.  */
       nmaps = current_minor_maps (0, &maps);
 
       for (i = --nmaps; i >= 0; i--)
         if (!NILP (maps[i]))
           keymaps = Fcons (maps[i], keymaps);
 
+      /* This returns nil unless there is a `keymap' property.  */
       local = get_local_map (PT, current_buffer, Qkeymap);
       if (!NILP (local))
         keymaps = Fcons (local, keymaps);
diff --git a/src/lisp.h b/src/lisp.h
index b3220f43f34..cff80f1d090 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2464,7 +2464,7 @@ extern void syms_of_xdisp P_ ((void));
 extern void init_xdisp P_ ((void));
 extern Lisp_Object safe_eval P_ ((Lisp_Object));
 extern int pos_visible_p P_ ((struct window *, int, int *,
-                              int *, int *, int));
+                              int *, int *, int *, int));
 
 /* Defined in vm-limit.c.  */
 extern void memory_warnings P_ ((POINTER_TYPE *, void (*warnfun) ()));
@@ -2906,6 +2906,7 @@ EXFUN (Fevent_convert_list, 1);
 EXFUN (Fread_key_sequence, 5);
 EXFUN (Fset_input_mode, 4);
 extern int detect_input_pending P_ ((void));
+extern int detect_input_pending_ignore_squeezables P_ ((void));
 extern int detect_input_pending_run_timers P_ ((int));
 extern void safe_run_hooks P_ ((Lisp_Object));
 extern void cmd_error_internal P_ ((Lisp_Object, char *));
diff --git a/src/macfns.c b/src/macfns.c
index f40e8354f35..416522b49b9 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -55,6 +55,7 @@ static unsigned char gray_bits[] = {
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -1384,6 +1385,7 @@ x_set_foreground_color (f, arg, oldval)
      struct frame *f;
      Lisp_Object arg, oldval;
 {
+  struct mac_output *mac = f->output_data.mac;
   unsigned long fg, old_fg;
 
   fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
@@ -1392,10 +1394,28 @@ x_set_foreground_color (f, arg, oldval)
 
   if (FRAME_MAC_WINDOW (f) != 0)
     {
+      Display *dpy = FRAME_MAC_DISPLAY (f);
+
+      BLOCK_INPUT;
+      XSetForeground (dpy, mac->normal_gc, fg);
+      XSetBackground (dpy, mac->reverse_gc, fg);
+
+      if (mac->cursor_pixel == old_fg)
+        {
+          unload_color (f, mac->cursor_pixel);
+          mac->cursor_pixel = fg;
+          XSetBackground (dpy, mac->cursor_gc, mac->cursor_pixel);
+        }
+
+      UNBLOCK_INPUT;
+
       update_face_from_frame_parameter (f, Qforeground_color, arg);
+
       if (FRAME_VISIBLE_P (f))
         redraw_frame (f);
     }
+
+  unload_color (f, old_fg);
 }
 
 void
@@ -1403,11 +1423,24 @@ x_set_background_color (f, arg, oldval)
      struct frame *f;
      Lisp_Object arg, oldval;
 {
-  FRAME_BACKGROUND_PIXEL (f)
-    = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f));
+  struct mac_output *mac = f->output_data.mac;
+  unsigned long bg;
+
+  bg = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f));
+  unload_color (f, FRAME_BACKGROUND_PIXEL (f));
+  FRAME_BACKGROUND_PIXEL (f) = bg;
 
   if (FRAME_MAC_WINDOW (f) != 0)
     {
+      Display *dpy = FRAME_MAC_DISPLAY (f);
+
+      BLOCK_INPUT;
+      XSetBackground (dpy, mac->normal_gc, bg);
+      XSetForeground (dpy, mac->reverse_gc, bg);
+      XSetWindowBackground (dpy, FRAME_MAC_WINDOW (f), bg);
+      XSetForeground (dpy, mac->cursor_gc, bg);
+
+      UNBLOCK_INPUT;
       update_face_from_frame_parameter (f, Qbackground_color, arg);
 
       if (FRAME_VISIBLE_P (f))
@@ -2296,6 +2329,10 @@ mac_window (f)
   /* so that update events can find this mac_output struct */
   f->output_data.mac->mFP = f;  /* point back to emacs frame */
 
+  if (FRAME_MAC_WINDOW (f))
+    XSetWindowBackground (FRAME_MAC_DISPLAY(f), FRAME_MAC_WINDOW (f),
+                          FRAME_BACKGROUND_PIXEL (f));
+
   validate_x_resource_name ();
 
   /* x_set_name normally ignores requests to set the name if the
@@ -2490,9 +2527,11 @@ unwind_create_frame (frame)
 
       x_free_frame_resources (f);
 
+#if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
+#endif
       return Qt;
     }
 
@@ -3855,6 +3894,8 @@ x_create_tip_frame (dpyinfo, parms, text)
 #endif
       {
         FRAME_MAC_WINDOW (f) = tip_window;
+        XSetWindowBackground (FRAME_MAC_DISPLAY(f), tip_window,
+                              FRAME_BACKGROUND_PIXEL (f));
         SetWRefCon (tip_window, (long) f->output_data.mac);
         /* so that update events can find this mac_output struct */
         f->output_data.mac->mFP = f;
@@ -4237,6 +4278,9 @@ Value is t if tooltip was open, nil otherwise.  */)
                         File selection dialog
  ***********************************************************************/
 
+static pascal void mac_nav_event_callback P_ ((NavEventCallbackMessage,
+                                               NavCBRecPtr, void *));
+
 /**
    There is a relatively standard way to do this using applescript to run
    a (choose file) method.  However, this doesn't do "the right thing"
@@ -4261,8 +4305,9 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
   Lisp_Object file = Qnil;
   int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
-  char filename[1001];
+  char filename[MAXPATHLEN];
   int default_filter_index = 1; /* 1: All Files, 2: Directories only  */
+  static NavEventUPP mac_nav_event_callbackUPP = NULL;
 
   GCPRO6 (prompt, dir, default_filename, mustmatch, file, only_dir_p);
   CHECK_STRING (prompt);
@@ -4290,16 +4335,20 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
     options.optionFlags |= kNavSelectAllReadableItem;
     if (!NILP(prompt))
       {
-        message = cfstring_create_with_utf8_cstring (SDATA (prompt));
+        message =
+          cfstring_create_with_utf8_cstring (SDATA (ENCODE_UTF_8 (prompt)));
         options.message = message;
       }
     /* Don't set the application, let it use default.
     options.clientName = CFSTR ("Emacs");
     */
 
+    if (mac_nav_event_callbackUPP == NULL)
+      mac_nav_event_callbackUPP = NewNavEventUPP (mac_nav_event_callback);
+
     if (!NILP (only_dir_p))
-      status = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL,
-                                           &dialogRef);
+      status = NavCreateChooseFolderDialog(&options, mac_nav_event_callbackUPP,
+                                           NULL, NULL, &dialogRef);
     else if (NILP (mustmatch)) 
       { 
         /* This is a save dialog */
@@ -4309,21 +4358,26 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
 
         if (!NILP(default_filename))
           {
-            saveName =
-              cfstring_create_with_utf8_cstring (SDATA (default_filename));
+            Lisp_Object utf8 = ENCODE_UTF_8 (default_filename);
+            char *begPtr = SDATA(utf8);
+            char *filePtr = begPtr + SBYTES(utf8);
+            while (filePtr != begPtr && !IS_DIRECTORY_SEP(filePtr[-1]))
+              filePtr--;
+            saveName = cfstring_create_with_utf8_cstring (filePtr);
             options.saveFileName = saveName;
             options.optionFlags |= kNavSelectDefaultLocation;
           }
           status = NavCreatePutFileDialog(&options, 
                                           'TEXT', kNavGenericSignature,
-                                          NULL, NULL, &dialogRef);
+                                          mac_nav_event_callbackUPP, NULL,
+                                          &dialogRef);
         }
     else
       {
         /* This is an open dialog*/
         status = NavCreateChooseFileDialog(&options, fileTypes,
-                                           NULL, NULL, NULL, NULL, 
-                                           &dialogRef);
+                                           mac_nav_event_callbackUPP, NULL,
+                                           NULL, NULL, &dialogRef);
       }
     
     /* Set the default location and continue*/
@@ -4331,13 +4385,13 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
       if (!NILP(dir)) {
         FSRef defLoc;
         AEDesc defLocAed;
-        status = FSPathMakeRef(SDATA(dir), &defLoc, NULL);
+        status = FSPathMakeRef(SDATA(ENCODE_FILE(dir)), &defLoc, NULL);
         if (status == noErr) 
           {
             AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
             NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
+            AEDisposeDesc(&defLocAed);
           }
-        AEDisposeDesc(&defLocAed);
       }
 
       status = NavDialogRun(dialogRef);
@@ -4363,7 +4417,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
             status = NavDialogGetReply(dialogRef, &reply);
             AECoerceDesc(&reply.selection, typeFSRef, &aed);
             AEGetDescData(&aed, (void *) &fsRef, sizeof (FSRef));
-            FSRefMakePath(&fsRef, (UInt8 *) filename, 1000);
+            FSRefMakePath(&fsRef, (UInt8 *) filename, sizeof (filename));
             AEDisposeDesc(&aed);
             if (reply.saveFileName)
               {
@@ -4372,9 +4426,11 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
                 if (len && filename[len-1] != '/')
                   filename[len++] = '/';
                 CFStringGetCString(reply.saveFileName, filename+len, 
-                                   1000-len, kCFStringEncodingUTF8);
+                                   sizeof (filename) - len,
+                                   kCFStringEncodingUTF8);
               }
-            file = DECODE_FILE(build_string (filename));
+            file = DECODE_FILE (make_unibyte_string (filename,
+                                                     strlen (filename)));
             NavDisposeReply(&reply);
           }
           break;
@@ -4400,6 +4456,15 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
 }
 
 
+/* Need to register some event callback function for enabling drag and
+   drop in Navigation Service dialogs.  */
+static pascal void
+mac_nav_event_callback (selector, parms, data)
+     NavEventCallbackMessage selector;
+     NavCBRecPtr parms;
+     void *data ;
+{
+}
 #endif
 
 /***********************************************************************
diff --git a/src/macgui.h b/src/macgui.h
index 1e1447dfaa8..cb157bb8c25 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -92,6 +92,13 @@ typedef struct _XCharStruct
   int descent;
 } XCharStruct;
 
+#define STORE_XCHARSTRUCT(xcs, w, bds)                  \
+  ((xcs).width = (w),                                   \
+   (xcs).lbearing = (bds).left,                         \
+   (xcs).rbearing = (bds).right,                        \
+   (xcs).ascent = -(bds).top,                           \
+   (xcs).descent = (bds).bottom)
+
 struct MacFontStruct {
   char *fontname;
 
diff --git a/src/macterm.c b/src/macterm.c
index fad69ce6944..16878f9a45a 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1,5 +1,5 @@
 /* Implementation of GUI terminal on the Mac OS.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -69,6 +69,7 @@ Boston, MA 02111-1307, USA.  */
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include "keyboard.h"
 #include "frame.h"
@@ -100,6 +101,10 @@ Boston, MA 02111-1307, USA.  */
 
 Lisp_Object Vx_toolkit_scroll_bars;
 
+/* If Non-nil, the text will be rendered using Core Graphics text rendering which may anti-alias the text.  */
+Lisp_Object Vmac_use_core_graphics;
+
+
 /* Non-zero means that a HELP_EVENT has been generated since Emacs
    start.  */
 
@@ -724,6 +729,13 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
      int nchars, mode, bytes_per_char;
 {
   SetPortWindowPort (w);
+#ifdef MAC_OS_X_VERSION_10_2
+  UInt32 textFlags, savedFlags;
+  if (!NILP(Vmac_use_core_graphics)) {
+    textFlags = kQDUseCGTextRendering;
+    savedFlags = SwapQDTextFlags(textFlags);
+  }
+#endif
 
   mac_set_colors (gc);
 
@@ -734,6 +746,10 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
 
   MoveTo (x, y);
   DrawText (buf, 0, nchars * bytes_per_char);
+#ifdef MAC_OS_X_VERSION_10_2
+  if (!NILP(Vmac_use_core_graphics))
+    SwapQDTextFlags(savedFlags);
+#endif
 }
 
 
@@ -1090,6 +1106,62 @@ XSetForeground (display, gc, color)
 }
 
 
+/* Mac replacement for XSetBackground.  */
+
+void
+XSetBackground (display, gc, color)
+     Display *display;
+     GC gc;
+     unsigned long color;
+{
+  gc->background = color;
+}
+
+
+/* Mac replacement for XSetWindowBackground.  */
+
+void
+XSetWindowBackground (display, w, color)
+     Display *display;
+     WindowPtr w;
+     unsigned long color;
+{
+#if !TARGET_API_MAC_CARBON
+  AuxWinHandle aw_handle;
+  CTabHandle ctab_handle;
+  ColorSpecPtr ct_table;
+  short ct_size;
+#endif
+  RGBColor bg_color;
+
+  bg_color.red = RED16_FROM_ULONG (color);
+  bg_color.green = GREEN16_FROM_ULONG (color);
+  bg_color.blue = BLUE16_FROM_ULONG (color);
+
+#if TARGET_API_MAC_CARBON
+  SetWindowContentColor (w, &bg_color);
+#else
+  if (GetAuxWin (w, &aw_handle))
+    {
+      ctab_handle = (*aw_handle)->awCTable;
+      HandToHand ((Handle *) &ctab_handle);
+      ct_table = (*ctab_handle)->ctTable;
+      ct_size = (*ctab_handle)->ctSize;
+      while (ct_size > -1)
+        {
+          if (ct_table->value == 0)
+            {
+              ct_table->rgb = bg_color;
+              CTabChanged (ctab_handle);
+              SetWinColor (w, (WCTabHandle) ctab_handle);
+            }
+          ct_size--;
+        }
+    }
+#endif
+}
+
+
 /* Mac replacement for XSetFont.  */
 
 static void
@@ -1919,20 +1991,33 @@ static void
 mac_compute_glyph_string_overhangs (s)
      struct glyph_string *s;
 {
-#if 0
-  /* MAC_TODO: XTextExtents16 does nothing yet... */
+  Rect r;
+  MacFontStruct *font = s->font;
+
+  TextFont (font->mac_fontnum);
+  TextSize (font->mac_fontsize);
+  TextFace (font->mac_fontface);
 
-  if (s->cmp == NULL
-      && s->first_glyph->type == CHAR_GLYPH)
+  if (s->two_byte_p)
+    QDTextBounds (s->nchars * 2, (char *)s->char2b, &r);
+  else
     {
-      XCharStruct cs;
-      int direction, font_ascent, font_descent;
-      XTextExtents16 (s->font, s->char2b, s->nchars, &direction,
-                      &font_ascent, &font_descent, &cs);
-      s->right_overhang = cs.rbearing > cs.width ? cs.rbearing - cs.width : 0;
-      s->left_overhang = cs.lbearing < 0 ? -cs.lbearing : 0;
+      int i;
+      char *buf = xmalloc (s->nchars);
+
+      if (buf == NULL)
+        SetRect (&r, 0, 0, 0, 0);
+      else
+        {
+          for (i = 0; i < s->nchars; ++i)
+            buf[i] = s->char2b[i].byte2;
+          QDTextBounds (s->nchars, buf, &r);
+          xfree (buf);
+        }
     }
-#endif
+
+  s->right_overhang = r.right > s->width ? r.right - s->width : 0;
+  s->left_overhang = r.left < 0 ? -r.left : 0;
 }
 
 
@@ -2570,15 +2655,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   Rect clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
@@ -3006,10 +3085,12 @@ x_draw_glyph_string (s)
 {
   int relief_drawn_p = 0;
 
-  /* If S draws into the background of its successor, draw the
-     background of the successor first so that S can draw into it.
-     This makes S->next use XDrawString instead of XDrawImageString.  */
-  if (s->next && s->right_overhang && !s->for_overlaps_p)
+  /* If S draws into the background of its successor that does not
+     draw a cursor, draw the background of the successor first so that
+     S can draw into it.  This makes S->next use XDrawString instead
+     of XDrawImageString.  */
+  if (s->next && s->right_overhang && !s->for_overlaps_p
+      && s->next->hl != DRAW_CURSOR)
     {
       xassert (s->next->img == NULL);
       x_set_glyph_string_gc (s->next);
@@ -4650,29 +4731,10 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width - 1;
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y);
-
-  /* Compute the proper height and ascent of the rectangle, based
-     on the actual glyph.  Using the full height of the row looks
-     bad when there are tall images on that row.  */
-  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
-           cursor_glyph->ascent + cursor_glyph->descent);
-  if (h < row->height)
-    y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
-  h--;
+  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
+  wd = w->phys_cursor_width;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */
@@ -4952,7 +5014,8 @@ x_new_font (f, fontname)
   FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
   FRAME_FONTSET (f) = -1;
 
-  FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f));
+  FRAME_COLUMN_WIDTH (f) = fontp->average_width;
+  FRAME_SPACE_WIDTH (f) = fontp->space_width;
   FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
 
   compute_fringe_widths (f, 1);
@@ -5857,7 +5920,7 @@ decode_mac_font_name (name, size, scriptcode)
 
 
 static char *
-mac_to_x_fontname (name, size, style, scriptcode, encoding_base)
+mac_to_x_fontname (name, size, style, scriptcode)
      char *name;
      int size;
      Style style;
@@ -6475,12 +6538,8 @@ x_font_min_bounds (font, w, h)
      MacFontStruct *font;
      int *w, *h;
 {
-  /*
-   * TODO: Windows does not appear to offer min bound, only
-   * average and maximum width, and maximum height.
-   */
   *h = FONT_HEIGHT (font);
-  *w = FONT_WIDTH (font);
+  *w = font->min_bounds.width;
 }
 
 
@@ -6693,29 +6752,66 @@ XLoadQueryFont (Display *dpy, char *fontname)
        returns 15 for 12-point Monaco! */
     char_width = CharWidth ('m');
 
-  font->max_bounds.rbearing = char_width;
-  font->max_bounds.lbearing = 0;
-  font->max_bounds.width = char_width;
-  font->max_bounds.ascent = the_fontinfo.ascent;
-  font->max_bounds.descent = the_fontinfo.descent;
+  if (is_two_byte_font)
+    {
+      font->per_char = NULL;
 
-  font->min_bounds = font->max_bounds;
+      if (fontface & italic)
+        font->max_bounds.rbearing = char_width + 1;
+      else
+        font->max_bounds.rbearing = char_width;
+      font->max_bounds.lbearing = 0;
+      font->max_bounds.width = char_width;
+      font->max_bounds.ascent = the_fontinfo.ascent;
+      font->max_bounds.descent = the_fontinfo.descent;
 
-  if (is_two_byte_font || CharWidth ('m') == CharWidth ('i'))
-    font->per_char = NULL;
+      font->min_bounds = font->max_bounds;
+    }
   else
     {
       font->per_char = (XCharStruct *)
         xmalloc (sizeof (XCharStruct) * (0xff - 0x20 + 1));
       {
-        int c;
+        int c, min_width, max_width;
+        Rect char_bounds, min_bounds, max_bounds;
+        char ch;
 
+        min_width = max_width = char_width;
+        SetRect (&min_bounds, -32767, -32767, 32767, 32767);
+        SetRect (&max_bounds, 0, 0, 0, 0);
         for (c = 0x20; c <= 0xff; c++)
           {
-            font->per_char[c - 0x20] = font->max_bounds;
-            font->per_char[c - 0x20].width =
-              font->per_char[c - 0x20].rbearing = CharWidth (c);
-          }
+            ch = c;
+            char_width = CharWidth (ch);
+            QDTextBounds (1, &ch, &char_bounds);
+            STORE_XCHARSTRUCT (font->per_char[c - 0x20],
+                               char_width, char_bounds);
+            /* Some Japanese fonts (in SJIS encoding) return 0 as the
+               character width of 0x7f.  */
+            if (char_width > 0)
+              {
+                min_width = min (min_width, char_width);
+                max_width = max (max_width, char_width);
+              }
+            if (!EmptyRect (&char_bounds))
+              {
+                SetRect (&min_bounds,
+                         max (min_bounds.left, char_bounds.left),
+                         max (min_bounds.top, char_bounds.top),
+                         min (min_bounds.right, char_bounds.right),
+                         min (min_bounds.bottom, char_bounds.bottom));
+                UnionRect (&max_bounds, &char_bounds, &max_bounds);
+              }
+          }
+        STORE_XCHARSTRUCT (font->min_bounds, min_width, min_bounds);
+        STORE_XCHARSTRUCT (font->max_bounds, max_width, max_bounds);
+        if (min_width == max_width
+            && max_bounds.left >= 0 && max_bounds.right <= max_width)
+          {
+            /* Fixed width and no overhangs.  */
+            xfree (font->per_char);
+            font->per_char = NULL;
+          }
       }
     }
 
@@ -6823,6 +6919,35 @@ x_load_font (f, fontname, size)
     fontp->name = (char *) xmalloc (strlen (font->fontname) + 1);
     bcopy (font->fontname, fontp->name, strlen (font->fontname) + 1);
 
+    if (font->min_bounds.width == font->max_bounds.width)
+      {
+        /* Fixed width font.  */
+        fontp->average_width = fontp->space_width = font->min_bounds.width;
+      }
+    else
+      {
+        XChar2b char2b;
+        XCharStruct *pcm;
+
+        char2b.byte1 = 0x00, char2b.byte2 = 0x20;
+        pcm = mac_per_char_metric (font, &char2b, 0);
+        if (pcm)
+          fontp->space_width = pcm->width;
+        else
+          fontp->space_width = FONT_WIDTH (font);
+
+        if (pcm)
+          {
+            int width = pcm->width;
+            for (char2b.byte2 = 33; char2b.byte2 <= 126; char2b.byte2++)
+              if ((pcm = mac_per_char_metric (font, &char2b, 0)) != NULL)
+                width += pcm->width;
+            fontp->average_width = width / 95;
+          }
+        else
+          fontp->average_width = FONT_WIDTH (font);
+      }
+
     fontp->full_name = fontp->name;
 
     fontp->size = font->max_bounds.width;
@@ -7835,6 +7960,14 @@ mac_handle_window_event (next_handler, event, data)
 
   switch (GetEventKind (event))
     {
+    case kEventWindowUpdate:
+      result = CallNextEventHandler (next_handler, event);
+      if (result != eventNotHandledErr)
+        return result;
+
+      do_window_update (wp);
+      break;
+
     case kEventWindowBoundsChanging:
       result = CallNextEventHandler (next_handler, event);
       if (result != eventNotHandledErr)
@@ -7892,7 +8025,8 @@ install_window_handler (window)
 {
   OSErr err = noErr;
 #if USE_CARBON_EVENTS
-  EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowBoundsChanging}};
+  EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowUpdate},
+                           {kEventClassWindow, kEventWindowBoundsChanging}};
   static EventHandlerUPP handle_window_event_UPP = NULL;
 
   if (handle_window_event_UPP == NULL)
@@ -7987,24 +8121,28 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon)
         int i;
 
         /* AE file list is one based so just use that for indexing here.  */
-        for (i = 1; (err == noErr) && (i <= num_files_to_open); i++)
+        for (i = 1; i <= num_files_to_open; i++)
           {
-            FSSpec fs;
-            Str255 path_name, unix_path_name;
 #ifdef MAC_OSX
             FSRef fref;
-#endif
+            char unix_path_name[MAXPATHLEN];
+
+            err = AEGetNthPtr (&the_desc, i, typeFSRef, &keyword,
+                               &actual_type, &fref, sizeof (FSRef),
+                               &actual_size);
+            if (err != noErr || actual_type != typeFSRef)
+              continue;
+
+            if (FSRefMakePath (&fref, unix_path_name, sizeof (unix_path_name))
+                == noErr)
+#else
+            FSSpec fs;
+            Str255 path_name, unix_path_name;
 
             err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
                               (Ptr) &fs, sizeof (fs), &actual_size);
-            if (err != noErr) break;
+            if (err != noErr) continue;
 
-#ifdef MAC_OSX
-            err = FSpMakeFSRef (&fs, &fref);
-            if (err != noErr) break;
-
-            if (FSRefMakePath (&fref, unix_path_name, 255) == noErr)
-#else
             if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
                                         fs.name) &&
                 mac_to_posix_pathname (path_name, unix_path_name, 255))
@@ -8040,18 +8178,21 @@ mac_do_track_drag (DragTrackingMessage message, WindowPtr window,
   FlavorFlags theFlags;
   OSErr result;
 
+  if (GetFrontWindowOfClass (kMovableModalWindowClass, false))
+    return dragNotAcceptedErr;
+
   switch (message)
     {
     case kDragTrackingEnterHandler:
       CountDragItems (theDrag, &items);
-      can_accept = 1;
+      can_accept = 0;
       for (index = 1; index <= items; index++)
         {
           GetDragItemReferenceNumber (theDrag, index, &theItem);
           result = GetFlavorFlags (theDrag, theItem, flavorTypeHFS, &theFlags);
-          if (result != noErr)
+          if (result == noErr)
             {
-              can_accept = 0;
+              can_accept = 1;
               break;
             }
         }
@@ -8062,7 +8203,9 @@ mac_do_track_drag (DragTrackingMessage message, WindowPtr window,
         {
           RgnHandle hilite_rgn = NewRgn ();
           Rect r;
+          struct frame *f = mac_window_to_frame (window);
 
+          mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
           GetWindowPortBounds (window, &r);
           OffsetRect (&r, -r.left, -r.top);
           RectRgn (hilite_rgn, &r);
@@ -8078,6 +8221,9 @@ mac_do_track_drag (DragTrackingMessage message, WindowPtr window,
     case kDragTrackingLeaveWindow:
       if (can_accept)
         {
+          struct frame *f = mac_window_to_frame (window);
+
+          mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
           HideDragHilite (theDrag);
           SetThemeCursor (kThemeArrowCursor);
         }
@@ -8101,9 +8247,11 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
   OSErr result;
   ItemReference theItem;
   HFSFlavor data;
-  FSRef fref;
   Size size = sizeof (HFSFlavor);
 
+  if (GetFrontWindowOfClass (kMovableModalWindowClass, false))
+    return dragNotAcceptedErr;
+
   drag_and_drop_file_list = Qnil;
   GetDragMouse (theDrag, &mouse, 0L);
   CountDragItems (theDrag, &items);
@@ -8115,11 +8263,11 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
       if (result == noErr)
         {
 #ifdef MAC_OSX
-          FSRef frref;
+          FSRef fref;
+          char unix_path_name[MAXPATHLEN];
 #else
-          Str255 path_name;
+          Str255 path_name, unix_path_name;
 #endif
-          Str255 unix_path_name;
           GetFlavorData (theDrag, theItem, flavorTypeHFS, &data, &size, 0L);
 #ifdef MAC_OSX
           /* Use Carbon routines, otherwise it converts the file name
@@ -8137,8 +8285,6 @@ mac_do_receive_drag (WindowPtr window, void *handlerRefCon,
                                           strlen (unix_path_name)),
                      drag_and_drop_file_list);
         }
-      else
-        continue;
     }
   /* If there are items in the list, construct an event and post it to
      the queue like an interrupt using kbd_buffer_store_event.  */
@@ -8698,8 +8844,9 @@ XTread_socket (sd, expected, hold_quit)
           if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
               != eventNotHandledErr)
             break;
-#endif
+#else
           do_window_update ((WindowPtr) er.message);
+#endif
           break;
 
         case osEvt:
@@ -9568,7 +9715,7 @@ static struct redisplay_interface x_redisplay_interface =
   0, /* destroy_fringe_bitmap */
   mac_per_char_metric,
   mac_encode_char,
-  NULL, /* mac_compute_glyph_string_overhangs */
+  mac_compute_glyph_string_overhangs,
   x_draw_glyph_string,
   mac_define_frame_cursor,
   mac_clear_frame_area,
@@ -9756,18 +9903,18 @@ nil then the key will act as the normal Mac option modifier.  */);
 
   DEFVAR_LISP ("mac-reverse-ctrl-meta", &Vmac_reverse_ctrl_meta,
     doc: /* Non-nil means that the control and meta keys are reversed.  This is
-            useful for non-standard keyboard layouts.  */);
+useful for non-standard keyboard layouts.  */);
   Vmac_reverse_ctrl_meta = Qnil;
 
   DEFVAR_LISP ("mac-emulate-three-button-mouse",
                &Vmac_emulate_three_button_mouse,
     doc: /* t means that when the option-key is held down while pressing the
-    mouse button, the click will register as mouse-2 and while the
-    command-key is held down, the click will register as mouse-3.
-    'reverse means that the the option-key will register for mouse-3
-    and the command-key will register for mouse-2.  nil means that
-    not emulation should be done and the modifiers should be placed
-    on the mouse-1 event. */);
+mouse button, the click will register as mouse-2 and while the
+command-key is held down, the click will register as mouse-3.
+'reverse means that the the option-key will register for mouse-3
+and the command-key will register for mouse-2.  nil means that
+no emulation should be done and the modifiers should be placed
+on the mouse-1 event. */);
   Vmac_emulate_three_button_mouse = Qnil;
 
 #if USE_CARBON_EVENTS
@@ -9786,8 +9933,19 @@ Toolbox for processing before Emacs sees it.  */);
    doc: /* If non-nil, the Mac \"Control\" key is passed on to the Mac
 Toolbox for processing before Emacs sees it.  */);
   Vmac_pass_control_to_system = Qt;
+
+  DEFVAR_LISP ("mac-pass-control-to-system", &Vmac_pass_control_to_system,
+   doc: /* If non-nil, the Mac \"Control\" key is passed on to the Mac
+Toolbox for processing before Emacs sees it.  */);
+  Vmac_pass_control_to_system = Qt;
 #endif
 
+  DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics,
+   doc: /* If non-nil, allow anti-aliasing.
+The text will be rendered using Core Graphics text rendering which
+may anti-alias the text.  */);
+  Vmac_use_core_graphics = Qnil;
+
   DEFVAR_INT ("mac-keyboard-text-encoding", &mac_keyboard_text_encoding,
     doc: /* One of the Text Encoding Base constant values defined in the
 Basic Text Constants section of Inside Macintosh - Text Encoding
diff --git a/src/macterm.h b/src/macterm.h
index 7c7d55c3790..c1aa61e962b 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -599,6 +599,8 @@ extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *,
                                                unsigned int));
 extern void XFreePixmap P_ ((Display *, Pixmap));
 extern void XSetForeground P_ ((Display *, GC, unsigned long));
+extern void XSetBackground P_ ((Display *, GC, unsigned long));
+extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long));
 extern void mac_draw_line_to_pixmap P_ ((Display *, Pixmap, GC, int, int,
                                          int, int));
 extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *));
diff --git a/src/process.c b/src/process.c
index c17b32eb3c5..2d7dd6b3e8d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -187,6 +187,7 @@ extern Lisp_Object QCfilter;
 #include "syswait.h"
 
 extern void set_waiting_for_input P_ ((EMACS_TIME *));
+extern char *get_operating_system_release ();
 
 #ifndef USE_CRT_DLL
 extern int errno;
@@ -6701,6 +6702,19 @@ init_process ()
    Fprovide (intern ("make-network-process"), subfeatures);
  }
 #endif /* HAVE_SOCKETS */
+
+#ifdef DARWIN
+  /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive 
+     processes.  As such, we only change the default value.  */
+ if (initialized)
+  {
+    char *release = get_operating_system_release();
+    if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION
+                                    && release[1] == '.')) {
+      Vprocess_connection_type = Qnil;
+    }
+  }
+#endif
 }
 
 void
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 9f78405a43c..5b162ea08a3 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -37,6 +37,10 @@ Boston, MA 02111-1307, USA.  */
 #define BSD_SYSTEM
 /* #define VMS */
 
+#ifndef DARWIN
+#define DARWIN 1
+#endif
+
 /* MAC_OS is used to conditionally compile code common to both MAC_OS8
    and MAC_OSX.  */
 #ifdef MAC_OSX
@@ -103,10 +107,18 @@ Boston, MA 02111-1307, USA.  */
 
 /*
  *      Define HAVE_PTYS if the system supports pty devices.
+ *      Note: PTYs are broken on darwin <6.  Use at your own risk.
  */
 
 #define HAVE_PTYS
 
+/**
+ * PTYs only work correctly on Darwin 7 or higher.  So make the
+ * default for process-connection-type dependent on the kernel
+ * version.
+ */
+#define MIN_PTY_KERNEL_VERSION '7' 
+
 /*
  *      Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
  *      The 4.2 opendir, etc., library functions.
diff --git a/src/term.c b/src/term.c
index fc60b993ea4..274e453a9d8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1,5 +1,5 @@
 /* Terminal control module for terminals described by TERMCAP
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 98, 2000, 2001, 2002
+   Copyright (C) 1985, 86, 87, 93, 94, 95, 98, 2000, 2001, 2002, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -690,7 +690,7 @@ encode_terminal_code (src, src_len, coding)
                   if (! STRING_MULTIBYTE (string))
                     string = string_to_multibyte (string);
                   nbytes = buf - encode_terminal_buf;
-                  if (nbytes + SBYTES (string) < encode_terminal_bufsize)
+                  if (encode_terminal_bufsize < nbytes + SBYTES (string))
                     {
                       encode_terminal_bufsize = nbytes + SBYTES (string);
                       encode_terminal_buf = xrealloc (encode_terminal_buf,
diff --git a/src/undo.c b/src/undo.c
index df4b8d08cd6..eaf312be676 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -40,6 +40,10 @@ Lisp_Object last_undo_buffer;
 
 Lisp_Object Qinhibit_read_only;
 
+/* Marker for function call undo list elements.  */
+
+Lisp_Object Qapply;
+
 /* The first time a command records something for undo.
    it also allocates the undo-boundary object
    which will be added to the list at the end of the command.
@@ -519,7 +523,7 @@ Return what remains of the list.  */)
                 }
               else if (EQ (car, Qnil))
                 {
-                  /* Element (nil prop val beg . end) is property change.  */
+                  /* Element (nil PROP VAL BEG . END) is property change.  */
                   Lisp_Object beg, end, prop, val;
 
                   prop = Fcar (cdr);
@@ -543,6 +547,27 @@ Return what remains of the list.  */)
                   Fgoto_char (car);
                   Fdelete_region (car, cdr);
                 }
+              else if (EQ (car, Qapply))
+                {
+                  Lisp_Object oldlist = current_buffer->undo_list;
+                  /* Element (apply FUNNAME . ARGS) means call FUNNAME to undo.  */
+                  car = Fcar (cdr);
+                  if (INTEGERP (car))
+                    {
+                      /* Long format: (apply DELTA START END FUNNAME . ARGS).  */
+                      cdr = Fcdr (Fcdr (Fcdr (cdr)));
+                      car = Fcar (cdr);
+                    }
+                  cdr = Fcdr (cdr);
+                  apply1 (car, cdr);
+
+                  /* Make sure this produces at least one undo entry,
+                     so the test in `undo' for continuing an undo series
+                     will work right.  */
+                  if (EQ (oldlist, current_buffer->undo_list))
+                    current_buffer->undo_list
+                      = Fcons (list3 (Qapply, Qcdr, Qnil), current_buffer->undo_list);
+                }
               else if (STRINGP (car) && INTEGERP (cdr))
                 {
                   /* Element (STRING . POS) means STRING was deleted.  */
@@ -589,13 +614,16 @@ Return what remains of the list.  */)
   UNGCPRO;
   return unbind_to (count, list);
 }
-
+
 void
 syms_of_undo ()
 {
   Qinhibit_read_only = intern ("inhibit-read-only");
   staticpro (&Qinhibit_read_only);
 
+  Qapply = intern ("apply");
+  staticpro (&Qapply);
+
   pending_boundary = Qnil;
   staticpro (&pending_boundary);
 
@@ -627,17 +655,19 @@ which includes both saved text and other data.  */);
   DEFVAR_LISP ("undo-outer-limit", &Vundo_outer_limit,
               doc: /* Outer limit on size of undo information for one command.
 At garbage collection time, if the current command has produced
-more than this much undo information, it asks you whether to delete
-the information.  This is a last-ditch limit to prevent memory overflow.
+more than this much undo information, it discards the info and displays
+a warning.  This is a last-ditch limit to prevent memory overflow.
 
-The size is counted as the number of bytes occupied,
-which includes both saved text and other data.
+The size is counted as the number of bytes occupied, which includes
+both saved text and other data.  A value of nil means no limit.  In
+this case, accumulating one huge undo entry could make Emacs crash as
+a result of memory overflow.
 
 In fact, this calls the function which is the value of
 `undo-outer-limit-function' with one argument, the size.
 The text above describes the behavior of the function
 that variable usually specifies.  */);
-  Vundo_outer_limit = make_number (300000);
+  Vundo_outer_limit = make_number (3000000);
 
   DEFVAR_LISP ("undo-outer-limit-function", &Vundo_outer_limit_function,
                doc: /* Function to call when an undo list exceeds `undo-outer-limit'.
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 04739b8e846..092aff306dc 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -774,7 +774,10 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
   fontp->name = (char *) xmalloc (strlen (fontname) + 1);
   bcopy (fontname, fontp->name, strlen (fontname) + 1);
   fontp->full_name = fontp->name;
-  fontp->size = FONT_WIDTH (font);
+  /* FIXME: look at BDF spec to see if there are better ways of finding
+     average_width and space_width, hopefully that don't involve working out
+     the values for ourselves from the data.  */
+  fontp->size = fontp->average_width = fontp->space_width = FONT_WIDTH (font);
   fontp->height = FONT_HEIGHT (font);
 
     /* The slot `encoding' specifies how to map a character
diff --git a/src/w32fns.c b/src/w32fns.c
index 08780e05b1f..b7115601553 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -64,6 +64,7 @@ extern double atof ();
 extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object));
 extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT));
 extern void w32_free_menu_strings P_ ((HWND));
+extern XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
 
 extern int quit_char;
 
@@ -4544,7 +4545,7 @@ w32_load_system_font (f,fontname,size)
         /* Fill out details in lf according to the font that was
            actually loaded.  */
         lf.lfHeight = font->tm.tmInternalLeading - font->tm.tmHeight;
-        lf.lfWidth = font->tm.tmAveCharWidth;
+        lf.lfWidth = font->tm.tmMaxCharWidth;
         lf.lfWeight = font->tm.tmWeight;
         lf.lfItalic = font->tm.tmItalic;
         lf.lfCharSet = font->tm.tmCharSet;
@@ -4592,6 +4593,24 @@ w32_load_system_font (f,fontname,size)
     fontp->name = (char *) xmalloc (strlen (fontname) + 1);
     bcopy (fontname, fontp->name, strlen (fontname) + 1);
 
+    if (lf.lfPitchAndFamily == FIXED_PITCH)
+      {
+        /* Fixed width font.  */
+        fontp->average_width = fontp->space_width = FONT_WIDTH (font);
+      }
+    else
+      {
+        wchar_t space = 32;
+        XCharStruct* pcm;
+        pcm = w32_per_char_metric (font, &space, ANSI_FONT);
+        if (pcm)
+          fontp->space_width = pcm->width;
+        else
+          fontp->space_width = FONT_WIDTH (font);
+
+        fontp->average_width = font->tm.tmAveCharWidth;
+      }
+
     charset = xlfd_charset_of_font (fontname);
 
   /* Cache the W32 codepage for a font.  This makes w32_encode_char
diff --git a/src/w32term.c b/src/w32term.c
index e02019f45b9..93eabd9d0ad 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -819,8 +819,7 @@ w32_reset_terminal_modes (void)
 
 /* Function prototypes of this page.  */
 
-static XCharStruct *w32_per_char_metric P_ ((XFontStruct *,
-                                             wchar_t *, int));
+XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
 static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));
 
 
@@ -957,7 +956,7 @@ w32_native_per_char_metric (font, char2b, font_type, pcm)
 }
 
 
-static XCharStruct *
+XCharStruct *
 w32_per_char_metric (font, char2b, font_type)
      XFontStruct *font;
      wchar_t *char2b;
@@ -1922,15 +1921,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   RECT clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
@@ -4944,7 +4937,7 @@ x_draw_hollow_cursor (w, row)
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   HDC hdc;
   RECT rect;
-  int wd, h;
+  int h;
   struct glyph *cursor_glyph;
   HBRUSH hb = CreateSolidBrush (f->output_data.w32->cursor_pixel);
 
@@ -4954,34 +4947,12 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  rect.top = (WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y)
-              + row->ascent - w->phys_cursor_ascent);
-
-  /* Compute the proper height and ascent of the rectangle, based
-     on the actual glyph.  Using the full height of the row looks
-     bad when there are tall images on that row.  */
-  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
-           cursor_glyph->ascent + cursor_glyph->descent);
-  if (h < row->height)
-    rect.top += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
-  h--;
-
+  rect.top = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
   rect.bottom = rect.top + h;
+  rect.right = rect.left + w->phys_cursor_width;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width; /* TODO: Why off by one compared with X? */
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  rect.right = rect.left + wd;
   hdc = get_frame_dc (f);
   /* Set clipping, draw the rectangle, and reset clipping again.  */
   w32_clip_to_row (w, row, TEXT_AREA, hdc);
@@ -5290,7 +5261,8 @@ x_new_font (f, fontname)
   FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
   FRAME_FONTSET (f) = -1;
 
-  FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f));
+  FRAME_COLUMN_WIDTH (f) = fontp->average_width;
+  FRAME_SPACE_WIDTH (f) = fontp->space_width;
   FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
 
   compute_fringe_widths (f, 1);
diff --git a/src/window.c b/src/window.c
index ff536be55aa..f49e6cccbb7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -126,6 +126,11 @@ Lisp_Object Vother_window_scroll_buffer;
 
 Lisp_Object Vtemp_buffer_show_function;
 
+/* Non-zero means line and page scrolling on tall lines (with images)
+   does partial scrolling by modifying window-vscroll.  */
+
+int auto_window_vscroll_p;
+
 /* Non-zero means to use mode-line-inactive face in all windows but the
    selected-window and the minibuffer-scroll-window when the
    minibuffer is active.  */
@@ -330,9 +335,10 @@ If POS is only out of view because of horizontal scrolling, return non-nil.
 POS defaults to point in WINDOW; WINDOW defaults to the selected window.
 
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
-return value is a list (X Y FULLY) where X and Y are the pixel coordinates
-relative to the top left corner of the window, and FULLY is t if the
-character after POS is fully visible and nil otherwise.  */)
+return value is a list (X Y PARTIAL) where X and Y are the pixel coordinates
+relative to the top left corner of the window. PARTIAL is nil if the character
+after POS is fully visible; otherwise it is a cons (RTOP . RBOT) where RTOP
+and RBOT are the number of pixels invisible at the top and bottom of the row.  */)
      (pos, window, partially)
      Lisp_Object pos, window, partially;
 {
@@ -341,7 +347,7 @@ character after POS is fully visible and nil otherwise.  */)
   register struct buffer *buf;
   struct text_pos top;
   Lisp_Object in_window = Qnil;
-  int fully_p = 1;
+  int rtop, rbot, fully_p = 1;
   int x, y;
 
   w = decode_window (window);
@@ -364,14 +370,17 @@ character after POS is fully visible and nil otherwise.  */)
       && posint <= BUF_ZV (buf)
       && CHARPOS (top) >= BUF_BEGV (buf)
       && CHARPOS (top) <= BUF_ZV (buf)
-      && pos_visible_p (w, posint, &fully_p, &x, &y, NILP (partially))
-      && (!NILP (partially) || fully_p))
+      && pos_visible_p (w, posint, &x, &y, &rtop, &rbot, NILP (partially))
+      && (fully_p = !rtop && !rbot, (!NILP (partially) || fully_p)))
     in_window = Qt;
 
   if (!NILP (in_window) && !NILP (partially))
     in_window = Fcons (make_number (x),
                        Fcons (make_number (y),
-                              Fcons (fully_p ? Qt : Qnil, Qnil)));
+                              Fcons ((fully_p ? Qnil
+                                     : Fcons (make_number (rtop),
+                                              make_number (rbot))),
+                                     Qnil)));
   return in_window;
 }
 
@@ -4566,6 +4575,33 @@ window_scroll_pixel_based (window, n, whole, noerror)
 
       start = it.current.pos;
     }
+  else if (auto_window_vscroll_p)
+    {
+      if (tem = XCAR (XCDR (XCDR (tem))), CONSP (tem))
+        {
+          int px;
+          int dy = WINDOW_FRAME_LINE_HEIGHT (w);
+          if (whole)
+            dy = max ((window_box_height (w)
+                       - next_screen_context_lines * dy),
+                      dy);
+          dy *= n;
+
+          if (n < 0 && (px = XINT (XCAR (tem))) > 0)
+            {
+              px = max (0, -w->vscroll - min (px, -dy));
+              Fset_window_vscroll (window, make_number (px), Qt);
+              return;
+            }
+          if (n > 0 && (px = XINT (XCDR (tem))) > 0)
+            {
+              px = max (0, -w->vscroll + min (px, dy));
+              Fset_window_vscroll (window, make_number (px), Qt);
+              return;
+            }
+        }
+      Fset_window_vscroll (window, make_number (0), Qt);
+    }
 
   /* If scroll_preserve_screen_position is non-nil, we try to set
      point in the same window line as it is now, so get that line.  */
@@ -4583,18 +4619,34 @@ window_scroll_pixel_based (window, n, whole, noerror)
   start_display (&it, w, start);
   if (whole)
     {
-      int screen_full = (window_box_height (w)
-                         - next_screen_context_lines * FRAME_LINE_HEIGHT (it.f));
-      int dy = n * screen_full;
+      int start_pos = IT_CHARPOS (it);
+      int dy = WINDOW_FRAME_LINE_HEIGHT (w);
+      dy = max ((window_box_height (w)
+                 - next_screen_context_lines * dy),
+                dy) * n;
 
       /* Note that move_it_vertically always moves the iterator to the
          start of a line.  So, if the last line doesn't have a newline,
          we would end up at the start of the line ending at ZV.  */
       if (dy <= 0)
-        move_it_vertically_backward (&it, -dy);
+        {
+          move_it_vertically_backward (&it, -dy);
+          /* Ensure we actually does move, e.g. in case we are currently
+             looking at an image that is taller that the window height.  */
+          while (start_pos == IT_CHARPOS (it)
+                 && start_pos > BEGV)
+            move_it_by_lines (&it, -1, 1);
+        }
       else if (dy > 0)
-        move_it_to (&it, ZV, -1, it.current_y + dy, -1,
-                    MOVE_TO_POS | MOVE_TO_Y);
+        {
+          move_it_to (&it, ZV, -1, it.current_y + dy, -1,
+                      MOVE_TO_POS | MOVE_TO_Y);
+          /* Ensure we actually does move, e.g. in case we are currently
+             looking at an image that is taller that the window height.  */
+          while (start_pos == IT_CHARPOS (it)
+                 && start_pos < ZV)
+            move_it_by_lines (&it, 1, 1);
+        }
     }
   else
     move_it_by_lines (&it, n, 1);
@@ -4690,7 +4742,8 @@ window_scroll_pixel_based (window, n, whole, noerror)
         ;
       else if (preserve_y >= 0)
         {
-          /* If we have a header line, take account of it.  */
+          /* If we have a header line, take account of it.
+             This is necessary because we set it.current_y to 0, above.  */
           if (WINDOW_WANTS_HEADER_LINE_P (w))
             preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
 
@@ -4730,9 +4783,14 @@ window_scroll_pixel_based (window, n, whole, noerror)
         {
           SET_TEXT_POS_FROM_MARKER (start, w->start);
           start_display (&it, w, start);
+#if 0  /* It's wrong to subtract this here
+          because we called start_display again
+          and did not alter it.current_y this time.  */
+
           /* If we have a header line, take account of it.  */
           if (WINDOW_WANTS_HEADER_LINE_P (w))
             preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
+#endif
 
           move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
           SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
@@ -6331,13 +6389,16 @@ If PIXELS-P is non-nil, the return value is VSCROLL.  */)
                       : XFLOATINT (vscroll));
       w->vscroll = min (w->vscroll, 0);
 
-      /* Adjust glyph matrix of the frame if the virtual display
-         area becomes larger than before.  */
-      if (w->vscroll < 0 && w->vscroll < old_dy)
-        adjust_glyphs (f);
+      if (w->vscroll != old_dy)
+        {
+          /* Adjust glyph matrix of the frame if the virtual display
+             area becomes larger than before.  */
+          if (w->vscroll < 0 && w->vscroll < old_dy)
+            adjust_glyphs (f);
 
-      /* Prevent redisplay shortcuts.  */
-      XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+          /* Prevent redisplay shortcuts.  */
+          XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+        }
     }
 
   return Fwindow_vscroll (window, pixels_p);
@@ -6649,6 +6710,10 @@ is displayed in the `mode-line' face.  */);
                doc: /* *Non-nil means `display-buffer' should make a separate frame.  */);
   pop_up_frames = 0;
 
+  DEFVAR_BOOL ("auto-window-vscroll", &auto_window_vscroll_p,
+               doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
+  auto_window_vscroll_p = 1;
+
   DEFVAR_BOOL ("display-buffer-reuse-frames", &display_buffer_reuse_frames,
                doc: /* *Non-nil means `display-buffer' should reuse frames.
 If the buffer in question is already displayed in a frame, raise that frame.  */);
diff --git a/src/xdisp.c b/src/xdisp.c
index 88eaedef087..ecbd5398120 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,6 +1,6 @@
 /* Display generation from window structure and buffer text.
-   Copyright (C) 1985,86,87,88,93,94,95,97,98,99,2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
+     2000, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -318,6 +318,10 @@ extern Lisp_Object Qcursor;
 
 Lisp_Object Vshow_trailing_whitespace;
 
+/* Non-nil means escape non-break space and hyphens.  */
+
+Lisp_Object Vshow_nonbreak_escape;
+
 #ifdef HAVE_WINDOW_SYSTEM
 extern Lisp_Object Voverflow_newline_into_fringe;
 
@@ -345,7 +349,6 @@ Lisp_Object Qtrailing_whitespace;
 /* Name and number of the face used to highlight escape glyphs.  */
 
 Lisp_Object Qescape_glyph;
-int escape_glyph_face;
 
 /* The symbol `image' which is the car of the lists used to represent
    images in Lisp.  */
@@ -1236,28 +1239,31 @@ line_bottom_y (it)
 }
 
 
-/* Return 1 if position CHARPOS is visible in window W.  Set *FULLY to
-   1 if POS is visible and the line containing POS is fully visible.
+/* Return 1 if position CHARPOS is visible in window W.
+   If visible, set *X and *Y to pixel coordinates of top left corner.
+   Set *RTOP and *RBOT to pixel height of an invisible area of glyph at POS.
    EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line
    and header-lines heights.  */
 
 int
-pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
+pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
      struct window *w;
-     int charpos, *fully, *x, *y, exact_mode_line_heights_p;
+     int charpos, *x, *y, *rtop, *rbot, exact_mode_line_heights_p;
 {
   struct it it;
   struct text_pos top;
-  int visible_p;
+  int visible_p = 0;
   struct buffer *old_buffer = NULL;
 
+  if (noninteractive)
+    return visible_p;
+
   if (XBUFFER (w->buffer) != current_buffer)
     {
       old_buffer = current_buffer;
       set_buffer_internal_1 (XBUFFER (w->buffer));
     }
 
-  *fully = visible_p = 0;
   SET_TEXT_POS_FROM_MARKER (top, w->start);
 
   /* Compute exact mode line heights, if requested.  */
@@ -1282,20 +1288,22 @@ pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
   if (IT_CHARPOS (it) >= charpos)
     {
       int top_y = it.current_y;
-      int bottom_y = line_bottom_y (&it);
+      int bottom_y = (last_height = 0, line_bottom_y (&it));
       int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
 
       if (top_y < window_top_y)
         visible_p = bottom_y > window_top_y;
       else if (top_y < it.last_visible_y)
-        {
           visible_p = 1;
-          *fully = bottom_y <= it.last_visible_y;
-        }
       if (visible_p && x)
         {
           *x = it.current_x;
-          *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
+          *y = max (top_y + max (0, it.max_ascent - it.ascent), window_top_y);
+          if (rtop)
+            {
+              *rtop = max (0, window_top_y - top_y);
+              *rbot = max (0, bottom_y - it.last_visible_y);
+            }
         }
     }
   else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
@@ -1312,6 +1320,11 @@ pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
               move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
               *x = it2.current_x;
               *y = it2.current_y + it2.max_ascent - it2.ascent;
+              if (rtop)
+                {
+                  *rtop = 0;
+                  *rbot = max (0, (it2.current_y + it2.max_ascent + it2.max_descent) - it.last_visible_y);
+                }
             }
         }
     }
@@ -1769,6 +1782,24 @@ get_glyph_string_clip_rect (s, nr)
       r.height = s->row->visible_height;
     }
 
+  if (s->clip_head)
+    if (r.x < s->clip_head->x)
+      {
+        if (r.width >= s->clip_head->x - r.x)
+          r.width -= s->clip_head->x - r.x;
+        else
+          r.width = 0;
+        r.x = s->clip_head->x;
+      }
+  if (s->clip_tail)
+    if (r.x + r.width > s->clip_tail->x + s->clip_tail->background_width)
+      {
+        if (s->clip_tail->x + s->clip_tail->background_width >= r.x)
+          r.width = s->clip_tail->x + s->clip_tail->background_width - r.x;
+        else
+          r.width = 0;
+      }
+
   /* If S draws overlapping rows, it's sufficient to use the top and
      bottom of the window for clipping because this glyph string
      intentionally draws over other lines.  */
@@ -1802,7 +1833,7 @@ get_glyph_string_clip_rect (s, nr)
   if (s->hl == DRAW_CURSOR)
     {
       struct glyph *glyph = s->first_glyph;
-      int height;
+      int height, max_y;
 
       if (s->x > r.x)
         {
@@ -1811,13 +1842,26 @@ get_glyph_string_clip_rect (s, nr)
         }
       r.width = min (r.width, glyph->pixel_width);
 
-      /* Don't draw cursor glyph taller than our actual glyph.  */
-      height = max (FRAME_LINE_HEIGHT (s->f), glyph->ascent + glyph->descent);
-      if (height < r.height)
+      /* If r.y is below window bottom, ensure that we still see a cursor.  */
+      height = min (glyph->ascent + glyph->descent,
+                    min (FRAME_LINE_HEIGHT (s->f), s->row->visible_height));
+      max_y = window_text_bottom_y (s->w) - height;
+      max_y = WINDOW_TO_FRAME_PIXEL_Y (s->w, max_y);
+      if (s->ybase - glyph->ascent > max_y)
+        {
+          r.y = max_y;
+          r.height = height;
+        }
+      else
         {
-          int max_y = r.y + r.height;
-          r.y = min (max_y, s->ybase + glyph->descent - height);
-          r.height = min (max_y - r.y, height);
+          /* Don't draw cursor glyph taller than our actual glyph.  */
+          height = max (FRAME_LINE_HEIGHT (s->f), glyph->ascent + glyph->descent);
+          if (height < r.height)
+            {
+              max_y = r.y + r.height;
+              r.y = min (max_y, max (r.y, s->ybase + glyph->descent - height));
+              r.height = min (max_y - r.y, height);
+            }
         }
     }
 
@@ -1828,6 +1872,64 @@ get_glyph_string_clip_rect (s, nr)
 #endif
 }
 
+
+/* EXPORT:
+   Return the position and height of the phys cursor in window W.
+   Set w->phys_cursor_width to width of phys cursor.
+*/
+
+int
+get_phys_cursor_geometry (w, row, glyph, heightp)
+     struct window *w;
+     struct glyph_row *row;
+     struct glyph *glyph;
+     int *heightp;
+{
+  struct frame *f = XFRAME (WINDOW_FRAME (w));
+  int x, y, wd, h, h0, y0;
+
+  /* Compute the width of the rectangle to draw.  If on a stretch
+     glyph, and `x-stretch-block-cursor' is nil, don't draw a
+     rectangle as wide as the glyph, but use a canonical character
+     width instead.  */
+  wd = glyph->pixel_width - 1;
+#ifdef HAVE_NTGUI
+  wd++; /* Why? */
+#endif
+  if (glyph->type == STRETCH_GLYPH
+      && !x_stretch_cursor_p)
+    wd = min (FRAME_COLUMN_WIDTH (f), wd);
+  w->phys_cursor_width = wd;
+
+  y = w->phys_cursor.y + row->ascent - glyph->ascent;
+
+  /* If y is below window bottom, ensure that we still see a cursor.  */
+  h0 = min (FRAME_LINE_HEIGHT (f), row->visible_height);
+
+  h = max (h0, glyph->ascent + glyph->descent);
+  h0 = min (h0, glyph->ascent + glyph->descent);
+
+  y0 = WINDOW_HEADER_LINE_HEIGHT (w);
+  if (y < y0)
+    {
+      h = max (h - (y0 - y) + 1, h0);
+      y = y0 - 1;
+    }
+  else
+    {
+      y0 = window_text_bottom_y (w) - h0;
+      if (y > y0)
+        {
+          h += y - y0;
+          y = y0;
+        }
+    }
+
+  *heightp = h - 1;
+  return WINDOW_TO_FRAME_PIXEL_Y (w, y);
+}
+
+
 #endif /* HAVE_WINDOW_SYSTEM */
 
 
@@ -3261,11 +3363,13 @@ setup_for_ellipsis (it, len)
 
   it->dpvec_char_len = len;
   it->current.dpvec_index = 0;
+  it->dpvec_face_id = -1;
 
   /* Remember the current face id in case glyphs specify faces.
      IT's face is restored in set_iterator_to_next.  */
   it->saved_face_id = it->face_id;
   it->method = next_element_from_display_vector;
+  it->ellipsis_p = 1;
 }
 
 
@@ -4564,51 +4668,53 @@ static void
 back_to_previous_visible_line_start (it)
      struct it *it;
 {
-  int visible_p = 0;
-
-  /* Go back one newline if not on BEGV already.  */
-  if (IT_CHARPOS (*it) > BEGV)
-    back_to_previous_line_start (it);
-
-  /* Move over lines that are invisible because of selective display
-     or text properties.  */
-  while (IT_CHARPOS (*it) > BEGV
-         && !visible_p)
+  while (IT_CHARPOS (*it) > BEGV)
     {
-      visible_p = 1;
+      back_to_previous_line_start (it);
+      if (IT_CHARPOS (*it) <= BEGV)
+        break;
 
       /* If selective > 0, then lines indented more than that values
          are invisible.  */
       if (it->selective > 0
           && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
                                 (double) it->selective)) /* iftc */
-        visible_p = 0;
-      else
-        {
-          Lisp_Object prop;
+        continue;
 
-          /* Check the newline before point for invisibility.  */
-          prop = Fget_char_property (make_number (IT_CHARPOS (*it) - 1),
+      /* Check the newline before point for invisibility.  */
+      {
+        Lisp_Object prop;
+        prop = Fget_char_property (make_number (IT_CHARPOS (*it) - 1),
                                      Qinvisible, it->window);
-          if (TEXT_PROP_MEANS_INVISIBLE (prop))
-            visible_p = 0;
-        }
-
-#if 0
-      /* Commenting this out fixes the bug described in
-         http://www.math.ku.dk/~larsh/emacs/emacs-loops-on-large-images/test-case.txt.  */
-      if (visible_p)
-        {
-          struct it it2 = *it;
-
-          if (handle_display_prop (&it2) == HANDLED_RETURN)
-            visible_p = 0;
-        }
-#endif
+        if (TEXT_PROP_MEANS_INVISIBLE (prop))
+          continue;
+      }
 
-      /* Back one more newline if the current one is invisible.  */
-      if (!visible_p)
-        back_to_previous_line_start (it);
+      /* If newline has a display property that replaces the newline with something
+         else (image or text), find start of overlay or interval and continue search
+         from that point.  */
+      {
+        struct it it2 = *it;
+        int pos = IT_CHARPOS (*it);
+        int beg, end;
+        Lisp_Object val, overlay;
+
+        it2.sp = 0;
+        if (handle_display_prop (&it2) == HANDLED_RETURN
+            && !NILP (val = get_char_property_and_overlay
+                      (make_number (pos), Qdisplay, Qnil, &overlay))
+            && (OVERLAYP (overlay)
+                ? (beg = OVERLAY_POSITION (OVERLAY_START (overlay)))
+                : get_property_and_range (pos, Qdisplay, &val, &beg, &end, Qnil)))
+          {
+            if (beg < BEGV)
+              beg = BEGV;
+            IT_CHARPOS (*it) = beg;
+            IT_BYTEPOS (*it) = buf_charpos_to_bytepos (current_buffer, beg);
+            continue;
+          }
+      }
+      break;
     }
 
   xassert (IT_CHARPOS (*it) >= BEGV);
@@ -4906,8 +5012,10 @@ get_next_display_element (it)
                   it->dpvec = v->contents;
                   it->dpend = v->contents + v->size;
                   it->current.dpvec_index = 0;
+                  it->dpvec_face_id = -1;
                   it->saved_face_id = it->face_id;
                   it->method = next_element_from_display_vector;
+                  it->ellipsis_p = 0;
                 }
               else
                 {
@@ -4939,8 +5047,8 @@ get_next_display_element (it)
                        ? ((it->c >= 127
                            && it->len == 1)
                           || !CHAR_PRINTABLE_P (it->c)
-                          || it->c == 0x8ad
-                          || it->c == 0x8a0)
+                          || (!NILP (Vshow_nonbreak_escape)
+                              && (it->c == 0x8ad || it->c == 0x8a0)))
                        : (it->c >= 127
                           && (!unibyte_display_via_language_environment
                               || it->c == unibyte_char_to_multibyte (it->c)))))
@@ -4952,21 +5060,8 @@ get_next_display_element (it)
                  display.  Then, set IT->dpvec to these glyphs.  */
               GLYPH g;
               int ctl_len;
-              int face_id = escape_glyph_face;
-
-              /* Find the face id if `escape-glyph' unless we recently did.  */
-              if (face_id < 0)
-                {
-                  Lisp_Object tem = Fget (Qescape_glyph, Qface);
-                  if (INTEGERP (tem))
-                    face_id = XINT (tem);
-                  else
-                    face_id = 0;
-                  /* If there's overflow, use 0 instead.  */
-                  if (FAST_GLYPH_FACE (FAST_MAKE_GLYPH (0, face_id)) != face_id)
-                    face_id = 0;
-                  escape_glyph_face = face_id;
-                }
+              int face_id, lface_id;
+              GLYPH escape_glyph;
 
               if (it->c < 128 && it->ctl_arrow_p)
                 {
@@ -4974,57 +5069,78 @@ get_next_display_element (it)
                   if (it->dp
                       && INTEGERP (DISP_CTRL_GLYPH (it->dp))
                       && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp))))
-                    g = XINT (DISP_CTRL_GLYPH (it->dp));
+                    {
+                      g = XINT (DISP_CTRL_GLYPH (it->dp));
+                      lface_id = FAST_GLYPH_FACE (g);
+                      if (lface_id)
+                        {
+                          g = FAST_GLYPH_CHAR (g);
+                          face_id = merge_faces (it->f, Qt, lface_id,
+                                                 it->face_id);
+                        }
+                    }
                   else
-                    g = FAST_MAKE_GLYPH ('^', face_id);
-                  XSETINT (it->ctl_chars[0], g);
+                    {
+                      /* Merge the escape-glyph face into the current face.  */
+                      face_id = merge_faces (it->f, Qescape_glyph, 0,
+                                             it->face_id);
+                      g = '^';
+                    }
 
-                  g = FAST_MAKE_GLYPH (it->c ^ 0100, face_id);
+                  XSETINT (it->ctl_chars[0], g);
+                  g = it->c ^ 0100;
                   XSETINT (it->ctl_chars[1], g);
                   ctl_len = 2;
+                  goto display_control;
                 }
-              else if (it->c == 0x8a0 || it->c == 0x8ad)
+
+              if (it->dp
+                  && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
+                  && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
                 {
-                  /* Set IT->ctl_chars[0] to the glyph for `\\'.  */
-                  if (it->dp
-                      && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
-                      && GLYPH_CHAR_VALID_P (XINT (DISP_ESCAPE_GLYPH (it->dp))))
-                    g = XINT (DISP_ESCAPE_GLYPH (it->dp));
-                  else
-                    g = FAST_MAKE_GLYPH ('\\', face_id);
-                  XSETINT (it->ctl_chars[0], g);
+                  escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
+                  lface_id = FAST_GLYPH_FACE (escape_glyph);
+                  if (lface_id)
+                    {
+                      escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
+                      face_id = merge_faces (it->f, Qt, lface_id,
+                                             it->face_id);
+                    }
+                }
+              else
+                {
+                  /* Merge the escape-glyph face into the current face.  */
+                  face_id = merge_faces (it->f, Qescape_glyph, 0,
+                                         it->face_id);
+                  escape_glyph = '\\';
+                }
 
-                  g = FAST_MAKE_GLYPH (it->c == 0x8ad ? '-' : ' ', face_id);
+              if (it->c == 0x8a0 || it->c == 0x8ad)
+                {
+                  XSETINT (it->ctl_chars[0], escape_glyph);
+                  g = it->c == 0x8ad ? '-' : ' ';
                   XSETINT (it->ctl_chars[1], g);
                   ctl_len = 2;
+                  goto display_control;
                 }
-              else
-                {
-                  unsigned char str[MAX_MULTIBYTE_LENGTH];
-                  int len;
-                  int i;
-                  GLYPH escape_glyph;
 
-                  /* Set IT->ctl_chars[0] to the glyph for `\\'.  */
-                  if (it->dp
-                      && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
-                      && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
-                    escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
-                  else
-                    escape_glyph = FAST_MAKE_GLYPH ('\\', face_id);
+              {
+                unsigned char str[MAX_MULTIBYTE_LENGTH];
+                int len;
+                int i;
 
-                  if (SINGLE_BYTE_CHAR_P (it->c))
-                    str[0] = it->c, len = 1;
-                  else
-                    {
-                      len = CHAR_STRING_NO_SIGNAL (it->c, str);
-                      if (len < 0)
-                        {
-                          /* It's an invalid character, which
-                             shouldn't happen actually, but due to
-                             bugs it may happen.  Let's print the char
-                             as is, there's not much meaningful we can
-                             do with it.  */
+                /* Set IT->ctl_chars[0] to the glyph for `\\'.  */
+                if (SINGLE_BYTE_CHAR_P (it->c))
+                  str[0] = it->c, len = 1;
+                else
+                  {
+                    len = CHAR_STRING_NO_SIGNAL (it->c, str);
+                    if (len < 0)
+                      {
+                        /* It's an invalid character, which shouldn't
+                           happen actually, but due to bugs it may
+                           happen.  Let's print the char as is, there's
+                           not much meaningful we can do with it.  */
                           str[0] = it->c;
                           str[1] = it->c >> 8;
                           str[2] = it->c >> 16;
@@ -5033,31 +5149,31 @@ get_next_display_element (it)
                         }
                     }
 
-                  for (i = 0; i < len; i++)
-                    {
-                      XSETINT (it->ctl_chars[i * 4], escape_glyph);
-                      /* Insert three more glyphs into IT->ctl_chars for
-                         the octal display of the character.  */
-                      g = FAST_MAKE_GLYPH (((str[i] >> 6) & 7) + '0',
-                                           face_id);
-                      XSETINT (it->ctl_chars[i * 4 + 1], g);
-                      g = FAST_MAKE_GLYPH (((str[i] >> 3) & 7) + '0',
-                                           face_id);
-                      XSETINT (it->ctl_chars[i * 4 + 2], g);
-                      g = FAST_MAKE_GLYPH ((str[i] & 7) + '0',
-                                           face_id);
-                      XSETINT (it->ctl_chars[i * 4 + 3], g);
-                    }
-                  ctl_len = len * 4;
-                }
+                for (i = 0; i < len; i++)
+                  {
+                    XSETINT (it->ctl_chars[i * 4], escape_glyph);
+                    /* Insert three more glyphs into IT->ctl_chars for
+                       the octal display of the character.  */
+                    g = ((str[i] >> 6) & 7) + '0';
+                    XSETINT (it->ctl_chars[i * 4 + 1], g);
+                    g = ((str[i] >> 3) & 7) + '0';
+                    XSETINT (it->ctl_chars[i * 4 + 2], g);
+                    g = (str[i] & 7) + '0';
+                    XSETINT (it->ctl_chars[i * 4 + 3], g);
+                  }
+                ctl_len = len * 4;
+              }
 
+            display_control:
               /* Set up IT->dpvec and return first character from it.  */
               it->dpvec_char_len = it->len;
               it->dpvec = it->ctl_chars;
               it->dpend = it->dpvec + ctl_len;
               it->current.dpvec_index = 0;
+              it->dpvec_face_id = face_id;
               it->saved_face_id = it->face_id;
               it->method = next_element_from_display_vector;
+              it->ellipsis_p = 0;
               goto get_next;
             }
         }
@@ -5180,9 +5296,6 @@ set_iterator_to_next (it, reseat_p)
           it->dpvec = NULL;
           it->current.dpvec_index = -1;
 
-          /* Recheck faces after display vector */
-          it->stop_charpos = 0;
-
           /* Skip over characters which were displayed via IT->dpvec.  */
           if (it->dpvec_char_len < 0)
             reseat_at_next_visible_line_start (it, 1);
@@ -5191,6 +5304,9 @@ set_iterator_to_next (it, reseat_p)
               it->len = it->dpvec_char_len;
               set_iterator_to_next (it, reseat_p);
             }
+
+          /* Recheck faces after display vector */
+          it->stop_charpos = IT_CHARPOS (*it);
         }
     }
   else if (it->method == next_element_from_string)
@@ -5270,7 +5386,6 @@ next_element_from_display_vector (it)
   if (INTEGERP (*it->dpvec)
       && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec)))
     {
-      int lface_id;
       GLYPH g;
 
       g = XFASTINT (it->dpvec[it->current.dpvec_index]);
@@ -5280,13 +5395,14 @@ next_element_from_display_vector (it)
       /* The entry may contain a face id to use.  Such a face id is
          the id of a Lisp face, not a realized face.  A face id of
          zero means no face is specified.  */
-      lface_id = FAST_GLYPH_FACE (g);
-      if (lface_id)
+      if (it->dpvec_face_id >= 0)
+        it->face_id = it->dpvec_face_id;
+      else
         {
-          /* The function returns -1 if lface_id is invalid.  */
-          int face_id = ascii_face_of_lisp_face (it->f, lface_id);
-          if (face_id >= 0)
-            it->face_id = face_id;
+          int lface_id = FAST_GLYPH_FACE (g);
+          if (lface_id > 0)
+            it->face_id = merge_faces (it->f, Qt, lface_id,
+                                       it->saved_face_id);
         }
     }
   else
@@ -5699,10 +5815,11 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
   saved_glyph_row = it->glyph_row;
   it->glyph_row = NULL;
 
-#define BUFFER_POS_REACHED_P()                      \
-  ((op & MOVE_TO_POS) != 0                          \
-   && BUFFERP (it->object)                          \
-   && IT_CHARPOS (*it) >= to_charpos)
+#define BUFFER_POS_REACHED_P()                  \
+  ((op & MOVE_TO_POS) != 0                      \
+   && BUFFERP (it->object)                      \
+   && IT_CHARPOS (*it) >= to_charpos            \
+   && it->method == next_element_from_buffer)
 
   while (1)
     {
@@ -6364,11 +6481,15 @@ move_it_by_lines (it, dvpos, need_y_p)
       it->current_y -= it2.current_y;
       it->current_x = it->hpos = 0;
 
-      /* If we moved too far, move IT some lines forward.  */
+      /* If we moved too far back, move IT some lines forward.  */
       if (it2.vpos > -dvpos)
         {
           int delta = it2.vpos + dvpos;
+          it2 = *it;
           move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS);
+          /* Move back again if we got too far ahead.  */
+          if (IT_CHARPOS (*it) >= start_charpos)
+            *it = it2;
         }
     }
 }
@@ -7960,6 +8081,8 @@ echo_area_display (update_frame_p)
 
   /* Last displayed message is now the current message.  */
   echo_area_buffer[1] = echo_area_buffer[0];
+  /* Inform read_char that we're not echoing.  */
+  echo_message_buffer = Qnil;
 
   /* Prevent redisplay optimization in redisplay_internal by resetting
      this_line_start_pos.  This is done because the mini-buffer now
@@ -10808,6 +10931,18 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
       glyph = cursor;
       x = cursor_x;
     }
+  else if (row->ends_in_ellipsis_p && glyph == end)
+    {
+      /* Scan back over the ellipsis glyphs, decrementing positions.  */
+      while (glyph > row->glyphs[TEXT_AREA]
+             && (glyph - 1)->charpos == last_pos)
+        glyph--, x -= glyph->pixel_width;
+      /* That loop always goes one position too far,
+         including the glyph before the ellipsis.
+         So scan forward over that one.  */
+      x += glyph->pixel_width;
+      glyph++;
+    }
   else if (string_start
            && (glyph == end || !BUFFERP (glyph->object) || last_pos > pt_old))
     {
@@ -11646,9 +11781,6 @@ redisplay_window (window, just_this_one_p)
   *w->desired_matrix->method = 0;
 #endif
 
-  /* Force this to be looked up again for each redisp of each window.  */
-  escape_glyph_face = -1;
-
   specbind (Qinhibit_point_motion_hooks, Qt);
 
   reconsider_clip_changes (w, buffer);
@@ -12193,6 +12325,8 @@ redisplay_window (window, just_this_one_p)
       /* If centering point failed to make the whole line visible,
          put point at the top instead.  That has to make the whole line
          visible, if it can be done.  */
+      if (centering_position == 0)
+        goto done;
       clear_glyph_matrix (w->desired_matrix);
       centering_position = 0;
       goto point_at_top;
@@ -14614,10 +14748,22 @@ cursor_row_p (w, row)
       /* If the row ends with a newline from a string, we don't want
          the cursor there (if the row is continued it doesn't end in a
          newline).  */
-      if (CHARPOS (row->end.string_pos) >= 0
-          || MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))
+      if (CHARPOS (row->end.string_pos) >= 0)
         cursor_row_p = row->continued_p;
-
+      else if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))
+        {
+          /* If the row ends in middle of a real character,
+             and the line is continued, we want the cursor here.
+             That's because MATRIX_ROW_END_CHARPOS would equal
+             PT if PT is before the character.  */
+          if (!row->ends_in_ellipsis_p)
+            cursor_row_p = row->continued_p;
+          else
+          /* If the row ends in an ellipsis, then
+             MATRIX_ROW_END_CHARPOS will equal point after the invisible text.
+             We want that position to be displayed after the ellipsis.  */
+            cursor_row_p = 0;
+        }
       /* If the row ends at ZV, display the cursor at the end of that
          row instead of at the start of the row below.  */
       else if (row->ends_at_zv_p)
@@ -15094,6 +15240,11 @@ display_line (it)
   /* Remember the position at which this line ends.  */
   row->end = it->current;
 
+  /* Record whether this row ends inside an ellipsis.  */
+  row->ends_in_ellipsis_p
+    = (it->method == next_element_from_display_vector
+       && it->ellipsis_p);
+
   /* Save fringe bitmaps in this row.  */
   row->left_user_fringe_bitmap = it->left_user_fringe_bitmap;
   row->left_user_fringe_face_id = it->left_user_fringe_face_id;
@@ -15937,22 +16088,30 @@ store_mode_line_string (string, lisp_string, copy_string, field_width, precision
 
 
 DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
-       0, 4, 0,
-       doc: /* Return the mode-line of selected window as a string.
-First optional arg FORMAT specifies a different format string (see
-`mode-line-format' for details) to use.  If FORMAT is t, return
-the buffer's header-line.  Second optional arg WINDOW specifies a
-different window to use as the context for the formatting.
-If third optional arg NO-PROPS is non-nil, string is not propertized.
-Fourth optional arg BUFFER specifies which buffer to use.  */)
-  (format, window, no_props, buffer)
-     Lisp_Object format, window, no_props, buffer;
+       1, 4, 0,
+       doc: /* Format a string out of a mode line format specification.
+First arg FORMAT specifies the mode line format (see `mode-line-format'
+for details) to use.
+
+Optional second arg FACE specifies the face property to put
+on all characters for which no face is specified.
+t means whatever face the window's mode line currently uses
+\(either `mode-line' or `mode-line-inactive', depending).
+nil means the default is no face property.
+If FACE is an integer, the value string has no text properties.
+
+Optional third and fourth args WINDOW and BUFFER specify the window
+and buffer to use as the context for the formatting (defaults
+are the selected window and the window's buffer).  */)
+  (format, face, window, buffer)
+     Lisp_Object format, face, window, buffer;
 {
   struct it it;
   int len;
   struct window *w;
   struct buffer *old_buffer = NULL;
-  enum face_id face_id = DEFAULT_FACE_ID;
+  int face_id = -1;
+  int no_props = INTEGERP (face);
 
   if (NILP (window))
     window = selected_window;
@@ -15961,37 +16120,37 @@ Fourth optional arg BUFFER specifies which buffer to use.  */)
 
   if (NILP (buffer))
     buffer = w->buffer;
-
   CHECK_BUFFER (buffer);
 
-  if (XBUFFER (buffer) != current_buffer)
+  if (NILP (format))
+    return build_string ("");
+
+  if (no_props)
+    face = Qnil;
+
+  if (!NILP (face))
     {
-      old_buffer = current_buffer;
-      set_buffer_internal_1 (XBUFFER (buffer));
+      if (EQ (face, Qt))
+        face = (EQ (window, selected_window) ? Qmode_line : Qmode_line_inactive);
+      face_id = lookup_named_face (XFRAME (WINDOW_FRAME (w)), face, 0, 0);
     }
 
-  if (NILP (format) || EQ (format, Qt))
+  if (face_id < 0)
+    face_id = DEFAULT_FACE_ID;
+
+  if (XBUFFER (buffer) != current_buffer)
     {
-      face_id = (NILP (format)
-                 ? CURRENT_MODE_LINE_FACE_ID (w)
-                 : HEADER_LINE_FACE_ID);
-      format = (NILP (format)
-                ? current_buffer->mode_line_format
-                : current_buffer->header_line_format);
+      old_buffer = current_buffer;
+      set_buffer_internal_1 (XBUFFER (buffer));
     }
 
   init_iterator (&it, w, -1, -1, NULL, face_id);
 
-  if (NILP (no_props))
+  if (!no_props)
     {
-      mode_line_string_face
-        = (face_id == MODE_LINE_FACE_ID ? Qmode_line
-           : face_id == MODE_LINE_INACTIVE_FACE_ID ? Qmode_line_inactive
-           : face_id == HEADER_LINE_FACE_ID ? Qheader_line : Qnil);
-
+      mode_line_string_face = face;
       mode_line_string_face_prop
-        = (NILP (mode_line_string_face) ? Qnil
-           : Fcons (Qface, Fcons (mode_line_string_face, Qnil)));
+        = (NILP (face) ? Qnil : Fcons (Qface, Fcons (face, Qnil)));
 
       /* We need a dummy last element in mode_line_string_list to
          indicate we are building the propertized mode-line string.
@@ -16014,7 +16173,7 @@ Fourth optional arg BUFFER specifies which buffer to use.  */)
   if (old_buffer)
     set_buffer_internal_1 (old_buffer);
 
-  if (NILP (no_props))
+  if (!no_props)
     {
       Lisp_Object str;
       mode_line_string_list = Fnreverse (mode_line_string_list);
@@ -18171,6 +18330,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
 {
   struct glyph_string *head, *tail;
   struct glyph_string *s;
+  struct glyph_string *clip_head = NULL, *clip_tail = NULL;
   int last_x, area_width;
   int x_reached;
   int i, j;
@@ -18239,6 +18399,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
           start = i;
           compute_overhangs_and_x (t, head->x, 1);
           prepend_glyph_string_lists (&head, &tail, h, t);
+          clip_head = head;
         }
 
       /* Prepend glyph strings for glyphs in front of the first glyph
@@ -18251,6 +18412,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
       i = left_overwriting (head);
       if (i >= 0)
         {
+          clip_head = head;
           BUILD_GLYPH_STRINGS (i, start, h, t,
                                DRAW_NORMAL_TEXT, dummy_x, last_x);
           for (s = h; s; s = s->next)
@@ -18270,6 +18432,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
                                DRAW_NORMAL_TEXT, x, last_x);
           compute_overhangs_and_x (h, tail->x + tail->width, 0);
           append_glyph_string_lists (&head, &tail, h, t);
+          clip_tail = tail;
         }
 
       /* Append glyph strings for glyphs following the last glyph
@@ -18280,6 +18443,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
       i = right_overwriting (tail);
       if (i >= 0)
         {
+          clip_tail = tail;
           BUILD_GLYPH_STRINGS (end, i, h, t,
                                DRAW_NORMAL_TEXT, x, last_x);
           for (s = h; s; s = s->next)
@@ -18287,6 +18451,12 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
           compute_overhangs_and_x (h, tail->x + tail->width, 0);
           append_glyph_string_lists (&head, &tail, h, t);
         }
+      if (clip_head || clip_tail)
+        for (s = head; s; s = s->next)
+          {
+            s->clip_head = clip_head;
+            s->clip_tail = clip_tail;
+          }
     }
 
   /* Draw all strings.  */
@@ -18300,8 +18470,9 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
          completely. */
       && !overlaps_p)
     {
-      int x0 = head ? head->x : x;
-      int x1 = tail ? tail->x + tail->background_width : x;
+      int x0 = clip_head ? clip_head->x : (head ? head->x : x);
+      int x1 = (clip_tail ? clip_tail->x + clip_tail->background_width
+                : (tail ? tail->x + tail->background_width : x));
 
       int text_left = window_box_left (w, TEXT_AREA);
       x0 -= text_left;
@@ -20553,6 +20724,28 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
       past_end = 1;
     }
 
+  /* If whole rows or last part of a row came from a display overlay,
+     row_containing_pos will skip over such rows because their end pos
+     equals the start pos of the overlay or interval.  Backtrack if we
+     have a STOP object and previous row's end glyph came from STOP.  */
+  if (!NILP (stop))
+    {
+      struct glyph_row *prev = row-1;
+      while ((prev = row - 1, prev >= first)
+             && MATRIX_ROW_END_CHARPOS (prev) == charpos
+             && prev->used[TEXT_AREA] > 0)
+        {
+          end = prev->glyphs[TEXT_AREA];
+          glyph = end + prev->used[TEXT_AREA];
+          while (--glyph >= end
+                 && INTEGERP (glyph->object));
+          if (glyph >= end
+              && !EQ (stop, glyph->object))
+            break;
+          row = prev;
+        }
+    }
+
   *x = row->x;
   *y = row->y;
   *vpos = MATRIX_ROW_VPOS (row, w->current_matrix);
@@ -21013,9 +21206,9 @@ note_mode_line_or_margin_highlight (w, x, y, area)
                   help_echo_pos = charpos;
                 }
             }
-          if (NILP (pointer))
-            pointer = Fsafe_plist_get (XCDR (object), QCpointer);
         }
+      if (NILP (pointer))
+        pointer = Fsafe_plist_get (XCDR (object), QCpointer);
     }
 
   if (STRINGP (string))
@@ -22319,6 +22512,10 @@ wide as that tab on the display.  */);
 The face used for trailing whitespace is `trailing-whitespace'.  */);
   Vshow_trailing_whitespace = Qnil;
 
+  DEFVAR_LISP ("show-nonbreak-escape", &Vshow_nonbreak_escape,
+    doc: /* *Non-nil means display escape character before non-break space and hyphen.  */);
+  Vshow_nonbreak_escape = Qt;
+
   DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer,
     doc: /* *The pointer shape to show in void text areas.
 Nil means to show the text pointer.  Other options are `arrow', `text',
diff --git a/src/xfaces.c b/src/xfaces.c
index a1b6b4bc775..e592357c067 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7696,6 +7696,69 @@ face_at_string_position (w, string, pos, bufpos, region_beg,
 }
 
 
+/* Merge a face into a realized face.
+
+   F is frame where faces are (to be) realized.
+
+   FACE_NAME is named face to merge.
+
+   If FACE_NAME is nil, FACE_ID is face_id of realized face to merge.
+
+   If FACE_NAME is t, FACE_ID is lface_id of face to merge.
+
+   BASE_FACE_ID is realized face to merge into.
+
+   Return new face id.
+*/
+
+int
+merge_faces (f, face_name, face_id, base_face_id)
+     struct frame *f;
+     Lisp_Object face_name;
+     int face_id, base_face_id;
+{
+  Lisp_Object attrs[LFACE_VECTOR_SIZE];
+  struct face *base_face;
+
+  base_face = FACE_FROM_ID (f, base_face_id);
+  if (!base_face)
+    return base_face_id;
+
+  if (EQ (face_name, Qt))
+    {
+      if (face_id < 0 || face_id >= lface_id_to_name_size)
+        return base_face_id;
+      face_name = lface_id_to_name[face_id];
+      face_id = lookup_derived_face (f, face_name, 0, base_face_id);
+      if (face_id >= 0)
+        return face_id;
+      return base_face_id;
+    }
+
+  /* Begin with attributes from the base face.  */
+  bcopy (base_face->lface, attrs, sizeof attrs);
+
+  if (!NILP (face_name))
+    {
+      if (!merge_named_face (f, face_name, attrs, 0))
+        return base_face_id;
+    }
+  else
+    {
+      struct face *face;
+      if (face_id < 0)
+        return base_face_id;
+      face = FACE_FROM_ID (f, face_id);
+      if (!face)
+        return base_face_id;
+      merge_face_vectors (f, face->lface, attrs, 0);
+    }
+
+  /* Look up a realized face with the given face attributes,
+     or realize a new one for ASCII characters.  */
+  return lookup_face (f, attrs, 0, NULL);
+}
+
 
 /***********************************************************************
                                 Tests
diff --git a/src/xfns.c b/src/xfns.c
index 6a99dbf8e5b..cafa36ae11c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4358,11 +4358,15 @@ show_hourglass (timer)
                     {
                       unsigned long mask = CWCursor;
                       XSetWindowAttributes attrs;
-
+#ifdef USE_GTK
+                      Window parent = FRAME_X_WINDOW (f);
+#else
+                      Window parent = FRAME_OUTER_WINDOW (f);
+#endif
                       attrs.cursor = f->output_data.x->hourglass_cursor;
 
                       f->output_data.x->hourglass_window
-                        = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f),
+                        = XCreateWindow (dpy, parent,
                                          0, 0, 32000, 32000, 0, 0,
                                          InputOnly,
                                          CopyFromParent,
diff --git a/src/xmenu.c b/src/xmenu.c
index 774f404fd42..f6e0523378f 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2454,10 +2454,6 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
                            G_CALLBACK (menu_highlight_callback));
   xg_crazy_callback_abort = 0;
 
-  for (i = 0; i < 5; i++)
-    if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
-      break;
-
   if (! for_click)
     {
       /* Not invoked by a click.  pop up at x/y.  */
@@ -2470,8 +2466,16 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
       popup_x_y.x = x;
       popup_x_y.y = y;
       popup_x_y.f = f;
-    }
 
+      i = 0;  /* gtk_menu_popup needs this to be 0 for a non-button popup.  */
+    }
+  else
+    {
+      for (i = 0; i < 5; i++)
+        if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
+          break;
+    }
+  
   /* Display the menu.  */
   gtk_widget_show_all (menu);
   gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);
diff --git a/src/xselect.c b/src/xselect.c
index 1a033f1d973..f26014746ba 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1400,7 +1400,7 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
       else if (INTEGERP (time_stamp))
         requestor_time = (Time) XUINT (time_stamp);
       else if (FLOATP (time_stamp))
-        requestor_time = (Time) XFLOAT (time_stamp);
+        requestor_time = (Time) XFLOAT_DATA (time_stamp);
       else
         error ("TIME_STAMP must be cons or number");
     }
@@ -2500,7 +2500,7 @@ x_check_property_data (data)
    DPY is the display use to look up X atoms.
    DATA is a Lisp list of values to be converted.
    RET is the C array that contains the converted values.  It is assumed
-   it is big enough to hol all values.
+   it is big enough to hold all values.
    FORMAT is 8, 16 or 32 and gives the size in bits for each C value to
    be stored in RET.  */
 
@@ -2524,7 +2524,7 @@ x_fill_property_data (dpy, data, ret, format)
       if (INTEGERP (o))
         val = (CARD32) XFASTINT (o);
       else if (FLOATP (o))
-        val = (CARD32) XFLOAT (o);
+        val = (CARD32) XFLOAT_DATA (o);
       else if (CONSP (o))
         val = (CARD32) cons_to_long (o);
       else if (STRINGP (o))
@@ -2629,7 +2629,7 @@ If the value is 0 or the atom is not known, return the empty string.  */)
   if (INTEGERP (value))
     atom = (Atom) XUINT (value);
   else if (FLOATP (value))
-    atom = (Atom) XFLOAT (value);
+    atom = (Atom) XFLOAT_DATA (value);
   else if (CONSP (value))
     atom = (Atom) cons_to_long (value);
   else
@@ -2761,7 +2761,7 @@ are ignored.  */)
   else if (INTEGERP (dest))
     wdest = (Window) XFASTINT (dest);
   else if (FLOATP (dest))
-    wdest =  (Window) XFLOAT (dest);
+    wdest =  (Window) XFLOAT_DATA (dest);
   else if (CONSP (dest))
     {
       if (! NUMBERP (XCAR (dest)) || ! NUMBERP (XCDR (dest)))
diff --git a/src/xterm.c b/src/xterm.c
index 766f0ed0b75..367b7741fa6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2129,15 +2129,9 @@ x_draw_glyph_string_box (s)
   struct glyph *last_glyph;
   XRectangle clip_rect;
 
-  last_x = window_box_right (s->w, s->area);
-  if (s->row->full_width_p
-      && !s->w->pseudo_window_p)
-    {
-      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
-      if (s->area != RIGHT_MARGIN_AREA
-          || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
-        last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
-    }
+  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
+            ? WINDOW_RIGHT_EDGE_X (s->w)
+            : window_box_right (s->w, s->area));
 
   /* The glyph that may have a right box line.  */
   last_glyph = (s->cmp || s->img
@@ -4332,7 +4326,7 @@ xg_scroll_callback (widget, data)
     }
 
   if (part >= 0)
-    { 
+    {
       window_being_scrolled = bar->window;
       last_scroll_bar_part = part;
       x_send_scroll_bar_event (bar->window, part, portion, whole);
@@ -7159,7 +7153,7 @@ x_clip_to_row (w, row, area, gc)
   window_box (w, area, &window_x, &window_y, &window_width, 0);
 
   clip_rect.x = window_x;
-  clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
+  clip_rect.y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, row->y));
   clip_rect.y = max (clip_rect.y, window_y);
   clip_rect.width = window_width;
   clip_rect.height = row->visible_height;
@@ -7189,29 +7183,10 @@ x_draw_hollow_cursor (w, row)
   if (cursor_glyph == NULL)
     return;
 
-  /* Compute the width of the rectangle to draw.  If on a stretch
-     glyph, and `x-stretch-block-cursor' is nil, don't draw a
-     rectangle as wide as the glyph, but use a canonical character
-     width instead.  */
-  wd = cursor_glyph->pixel_width - 1;
-  if (cursor_glyph->type == STRETCH_GLYPH
-      && !x_stretch_cursor_p)
-    wd = min (FRAME_COLUMN_WIDTH (f), wd);
-  w->phys_cursor_width = wd;
-
-  /* Compute frame-relative coordinates from window-relative
-     coordinates.  */
+  /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
-  y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y);
-
-  /* Compute the proper height and ascent of the rectangle, based
-     on the actual glyph.  Using the full height of the row looks
-     bad when there are tall images on that row.  */
-  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
-           cursor_glyph->ascent + cursor_glyph->descent);
-  if (h < row->height)
-    y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
-  h--;
+  y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
+  wd = w->phys_cursor_width;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */
@@ -7779,12 +7754,41 @@ x_connection_closed (dpy, error_message)
   error ("%s", error_msg);
 }
 
+/* We specifically use it before defining it, so that gcc doesn't inline it,
+   otherwise gdb doesn't know how to properly put a breakpoint on it.  */
+static void x_error_quitter (Display *display, XErrorEvent *error);
+
+/* This is the first-level handler for X protocol errors.
+   It calls x_error_quitter or x_error_catcher.  */
+
+static int
+x_error_handler (display, error)
+     Display *display;
+     XErrorEvent *error;
+{
+  if (! NILP (x_error_message_string))
+    x_error_catcher (display, error);
+  else
+    x_error_quitter (display, error);
+  return 0;
+}
 
 /* This is the usual handler for X protocol errors.
    It kills all frames on the display that we got the error for.
    If that was the only one, it prints an error message and kills Emacs.  */
 
-static void
+/* .gdbinit puts a breakpoint here, so make sure it is not inlined.  */
+
+#if __GNUC__ >= 3  /* On GCC 3.0 we might get a warning.  */
+#define NO_INLINE __attribute__((noinline))
+#else
+#define NO_INLINE
+#endif
+
+/* On older GCC versions, just putting x_error_quitter
+   after x_error_handler prevents inlining into the former.  */
+
+static void NO_INLINE
 x_error_quitter (display, error)
      Display *display;
      XErrorEvent *error;
@@ -7801,21 +7805,6 @@ x_error_quitter (display, error)
 }
 
 
-/* This is the first-level handler for X protocol errors.
-   It calls x_error_quitter or x_error_catcher.  */
-
-static int
-x_error_handler (display, error)
-     Display *display;
-     XErrorEvent *error;
-{
-  if (! NILP (x_error_message_string))
-    x_error_catcher (display, error);
-  else
-    x_error_quitter (display, error);
-  return 0;
-}
-
 /* This is the handler for X IO errors, always.
    It kills all frames on the display that we lost touch with.
    If that was the only one, it prints an error message and kills Emacs.  */
diff --git a/src/xterm.h b/src/xterm.h
index a5a4f88a7d4..5f568af935a 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -502,6 +502,8 @@ struct x_output
   GtkWidget *toolbar_widget;
   /* The handle box that makes the tool bar detachable.  */
   GtkWidget *handlebox_widget;
+  /* Non-zero if the tool bar is detached.  */
+  int toolbar_detached;
 
   /* The last size hints set.  */
   GdkGeometry size_hints;