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

Merge from emacs--cvs-trunk--0

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

21 files changed, 842 insertions, 248 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e2da7ae1a5f..18bd89e9dda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,206 @@
+2005-01-15  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (Vmac_use_core_graphics): defined for
+        mac-allow-anti-aliasing
+        (syms_of_macterm): Added mac-allow-anti-aliasing
+        (mac_draw_string_common): Use core graphics text rendering if
+        mac-allow-anti-aliasing is enabled.
+
+        * macfns.c (Fx_file_dialog): Save As dialog includes only the
+        file name in the text box.
+
+2005-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c (x_set_foreground_color, x_set_background_color): Sync
+        with xfns.c.
+        (mac_window, x_create_tip_frame): Use XSetWindowBackground.
+        * macterm.c (XSetBackground, XSetWindowBackground): New functions.
+        * macterm.h (XSetBackground, XSetWindowBackground): Add externs.
+
+2005-01-14  Kim F. Storm  <storm@cua.dk>
+
+        * keyboard.c (Fposn_at_x_y): Add optional arg WHOLE.
+
+2005-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (Fcurrent_active_maps): Ignore Voverriding_local_map
+        if Voverriding_terminal_local_map is non-nil.
+
+        * keyboard.c (syms_of_keyboard): Doc fix.
+
+2005-01-13  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (Fformat_mode_line): Fix last change.  Remove NO_PROPS arg
+        (specify 0 for FACE instead). Reorder arg list.  Doc fix.
+
+2005-01-12  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): New arg FACE specifies a default
+        face property for characters that don't specify one.
+
+        * fns.c (Frequire): Record in load-history unconditionally.
+
+2005-01-10  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (merge_faces): Rename from merge_into_realized_face.
+
+        * xfaces.c (merge_faces): Rename from merge_into_realized_face.
+        Callers changed.
+        Add support to merge with lisp face id too (if face_name is t).
+
+        * xdisp.c (get_next_display_element, next_element_from_display_vector):
+        Don't lookup lface_id from display table glyphs here; instead use
+        merge_faces to merge the lisp face id into current face.
+
+2005-01-09  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct it): New member dpvec_face_id.
+        (merge_into_realized_face): Add prototype.
+
+        * xfaces.c (merge_into_realized_face): New function.  Used to
+        merge escape-glyph face or face from display table into current face.
+
+        * xdisp.c (Vshow_nonbreak_escape): New lisp var.
+        (syms_of_xdisp): DEFVAR_LISP it.
+        (escape_glyph_face): Remove var.
+        (redisplay_window): Don't initialize it.
+        (setup_for_ellipsis, get_next_display_element):
+        Set it->dpvec_face_id to -1.
+        (get_next_display_element): Test Vshow_nonbreak_escape.
+        Do not setup escape_glyph_face.
+        Properly merge escape-glyph face or face from display table with
+        current face for escape and control characters.  Set
+        it->dpvec_face_id to relevant face id instead of adding it to each
+        element of display vector.
+        (next_element_from_display_vector): If it->dpvec_face_id is set,
+        use that instead of lface_id from glyph itself.
+
+2005-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): New member, toolbar_detached.
+
+        * gtkutil.c (xg_create_frame_widgets): Set initial tool bar height to
+        38.
+        (xg_tool_bar_detach_callback): Set toolbar_detached to 1.
+        (xg_tool_bar_attach_callback): Set toolbar_detached to 0.
+        (xg_create_tool_bar): Initialize toolbar_detached.
+        (update_frame_tool_bar): Only set FRAME_TOOLBAR_HEIGHT (f) if
+        toolbar_detached is zero.
+
+2005-01-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (create_and_show_popup_menu): Pass zero as button to
+        gtk_menu_popup if not for_click, so callbacks for the menu are called.
+
+        * gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
+        (xg_tool_bar_callback, xg_tool_bar_help_callback)
+        (update_frame_tool_bar): Cast to EMACS_INT to avoid compiler
+        warning.
+
+        * xselect.c (x_get_foreign_selection, x_fill_property_data)
+        (Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
+        XFLOAT_DATA to get extract number from Lisp object.
+
+2005-01-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_iterator_to_next): Fix 2004-12-13 change.
+        Set stop_charpos to current charpos instead of 0.
+
+2005-01-06  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xdisp.c (Fformat_mode_line): First arg now required.
+
+2005-01-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (XLoadQueryFont): Correctly handle 0 size
+        font widths that are returned from some Japanese fonts.
+
+2005-01-06  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (fringe_faces): Change to Lisp_Object pointer.
+        (draw_fringe_bitmap_1): Lookup user defined fringe faces here.
+        (destroy_fringe_bitmap): Set fringe_faces element to nil.
+        (Fdefine_fringe_bitmap, init_fringe): Change allocation of
+        fringe_faces array and init elements to nil.
+        (Fset_fringe_bitmap_face): Set fringe_faces to face name instead of
+        non-persistent face id.
+        (mark_fringe_data): New function for GC.
+
+        * alloc.c (mark_fringe_data): Declare extern.
+        (Fgarbage_collect): Call mark_fringe_data.
+
+        * alloc.c (overrun_check_free): Invalidate freed memory if
+        XMALLOC_CLEAR_FREE_MEMORY is defined.
+
+2005-01-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macfns.c: Include sys/param.h.
+        [TARGET_API_MAC_CARBON] (mac_nav_event_callback): New declaration
+        and function.
+        [TARGET_API_MAC_CARBON] (Fx_file_dialog): Use MAXPATHLEN for size
+        of filename string.  Set event callback function when creating
+        dialog boxes.  Add code conversions for filenames.  Don't dispose
+        apple event descriptor record if failed to create it.
+
+        * macterm.c: Include sys/param.h.
+        [USE_CARBON_EVENTS] (mac_handle_window_event): Add handler for
+        kEventWindowUpdate.
+        (install_window_handler) [USE_CARBON_EVENTS]: Register it.
+        (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Get FSRef instead
+        of FSSpec from apple event descriptor record.
+        (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Use MAXPATHLEN for
+        size of filename string.
+        [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.
+        [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a
+        file dialog is in action.
+        [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.  Reject
+        only when there are no filename items.  Set background color
+        before (un)highlighting the window below the dragged items.
+        (XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.
+
+2005-01-05  Romain Francoise  <romain@orebokech.com>
+
+        * term.c (encode_terminal_code): Fix buffer size computation.
+
+2005-01-04  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): Doc fix.
+
+2005-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * alloc.c (refill_memory_reserve): Move.
+        (emacs_blocked_free, emacs_blocked_malloc, emacs_blocked_realloc)
+        (reset_malloc_hooks, uninterrupt_malloc) [SYNC_INPUT]: Don't define.
+
+2005-01-03  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (window_scroll_pixel_based): Don't correct preserve_y
+        for CURRENT_HEADER_LINE_HEIGHT when moving backwards.
+
+2005-01-03  Jason Rumney  <jasonr@gnu.org>
+
+        * w32bdf.c (w32_load_bdf_font): Set fontp->average_width and
+        fontp->space_width to FONT_WIDTH so they are valid.
+
+        * w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
+        average width. Set fontp->average_width and fontp->space_width to
+        their appropriate values.
+
+        * w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
+        fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
+        fontp->space_width.
+
+2005-01-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_new_font): Set FRAME_SPACE_WIDTH.
+        (x_font_min_bounds, XLoadQueryFont): Use the correct font width
+        metrics for max and min bounds.
+        (x_load_font): Correctly calculate average font width metrics.
+
+2005-01-02  Richard M. Stallman  <rms@gnu.org>
+
+        * alloc.c (Fgarbage_collect): Don't truncate_undo_list on dead buffers.
+
 2004-12-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xterm.c (handle_one_xevent): Clear area in expose event for GTK.
@@ -48,7 +251,7 @@
 
         * xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
         fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
-        fontp-?space_width..
+        fontp->space_width.
         (x_load_font): Calculate fontp->space_width and
         fontp->average_width.
         (x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.
@@ -298,6 +501,10 @@
         * gtkutil.c (xg_initialize): Install bindings for C-g so that
         dialogs and menus pop down.
 
+2004-12-27  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (code_convert_region): Fix calculation of `ratio'.
+
 2004-12-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (update_frame_tool_bar): Make the value of
diff --git a/src/alloc.c b/src/alloc.c
index 6c393e9213b..998f736b9c5 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.  */
@@ -309,6 +309,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 */
@@ -704,9 +705,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);
@@ -1113,17 +1119,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));
@@ -1182,20 +1205,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 *
@@ -1347,6 +1356,7 @@ uninterrupt_malloc ()
   __realloc_hook = emacs_blocked_realloc;
 }
 
+#endif /* not SYNC_INPUT */
 #endif /* not SYSTEM_MALLOC */
 
 
@@ -4640,7 +4650,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.  */
@@ -4752,6 +4762,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/dispextern.h b/src/dispextern.h
index bc63455083b..8a24551260d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1841,6 +1841,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.  */
@@ -2755,6 +2758,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));
 void free_realized_face P_ ((struct frame *, struct face *));
diff --git a/src/fns.c b/src/fns.c
index 1d23318fcd7..542d0344fcb 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2906,6 +2906,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))
@@ -2913,8 +2917,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))
diff --git a/src/fringe.c b/src/fringe.c
index 52273af13ef..0373a736038 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -446,7 +446,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;
@@ -547,7 +547,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)
@@ -574,7 +580,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;
     }
 
@@ -1073,7 +1080,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)
@@ -1294,12 +1301,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));
+                = (unsigned *) 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;
                 }
             }
         }
@@ -1357,10 +1364,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;
 }
@@ -1434,6 +1439,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
@@ -1455,12 +1472,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));
+    = (unsigned *) 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..39d5e768dda 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
@@ -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,6 +3156,8 @@ 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.  */
@@ -3185,11 +3189,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 +3215,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 +3309,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 +3461,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 +3496,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 +3543,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/keyboard.c b/src/keyboard.c
index 29e65d3acda..7efea38121e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6845,7 +6845,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);
 
@@ -10516,17 +10516,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;
@@ -10539,7 +10541,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;
     }
@@ -10567,7 +10572,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;
 }
 
@@ -11267,14 +11272,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 5a7c8b19123..ea0b1843b85 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1519,10 +1519,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)))
     {
@@ -1530,16 +1533,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/macfns.c b/src/macfns.c
index f40e8354f35..33da9091575 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
@@ -3855,6 +3892,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 +4276,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 +4303,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 +4333,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 +4356,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 +4383,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 +4415,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 +4424,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 +4454,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/macterm.c b/src/macterm.c
index 353a1734258..d35a210e4c6 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -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"
@@ -102,6 +103,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.  */
 
@@ -726,6 +731,13 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
      int nchars, mode, bytes_per_char;
 {
   SetPortWindowPort (w);
+#ifdef MAC_OSX
+  UInt32 textFlags, savedFlags;
+  if (!NILP(Vmac_use_core_graphics)) {
+    textFlags = kQDUseCGTextRendering;
+    savedFlags = SwapQDTextFlags(textFlags);
+  }
+#endif
 
   mac_set_colors (gc);
 
@@ -736,6 +748,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_OSX
+  if (!NILP(Vmac_use_core_graphics))
+    SwapQDTextFlags(savedFlags);
+#endif
 }
 
 
@@ -1092,6 +1108,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
@@ -4963,7 +5035,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);
@@ -6499,12 +6572,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;
 }
 
 
@@ -6732,17 +6801,28 @@ XLoadQueryFont (Display *dpy, char *fontname)
       font->per_char = (XCharStruct *)
         xmalloc (sizeof (XCharStruct) * (0xff - 0x20 + 1));
       {
-        int c;
+        int c, min_width, max_width;
 
+        min_width = max_width = char_width;
         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);
-          }
+            font->per_char[c - 0x20] = font->max_bounds;
+            char_width = CharWidth (c);
+            font->per_char[c - 0x20].width = char_width;
+            font->per_char[c - 0x20].rbearing = char_width;
+            /* 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);
+              }
+            }
+        font->min_bounds.width = min_width;
+        font->max_bounds.width = max_width;
       }
     }
-
+  
   TextFont (old_fontnum);  /* restore previous font number, size and face */
   TextSize (old_fontsize);
   TextFace (old_fontface);
@@ -6847,6 +6927,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;
@@ -7861,6 +7970,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)
@@ -7918,7 +8035,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)
@@ -8013,24 +8131,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;
-
-#ifdef MAC_OSX
-            err = FSpMakeFSRef (&fs, &fref);
-            if (err != noErr) break;
+            if (err != noErr) continue;
 
-            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))
@@ -8066,18 +8188,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;
             }
         }
@@ -8088,7 +8213,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);
@@ -8104,6 +8231,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);
         }
@@ -8127,9 +8257,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);
@@ -8141,11 +8273,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
@@ -8163,8 +8295,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.  */
@@ -8724,8 +8854,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:
@@ -9811,8 +9942,17 @@ 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, 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 fd6b066af4c..f32b13000e6 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -602,6 +602,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/term.c b/src/term.c
index 6beac594ddf..d53ba74c781 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.
@@ -894,7 +894,7 @@ encode_terminal_code (src, src_len, coding)
               if (! STRING_MULTIBYTE (string))
                 string = string_to_multibyte (string);
               nbytes = buf - encode_terminal_src;
-              if (nbytes + SBYTES (string) < encode_terminal_src_size)
+              if (encode_terminal_src_size < nbytes + SBYTES (string))
                 {
                   encode_terminal_src_size = nbytes + SBYTES (string);
                   encode_terminal_src = xrealloc (encode_terminal_src,
diff --git a/src/w32bdf.c b/src/w32bdf.c
index a028d51d85a..5f073dc8478 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 df6228b09b1..e05c45c2a4e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -65,6 +65,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;
 
@@ -4545,7 +4546,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;
@@ -4593,6 +4594,25 @@ 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;
+      }
+
+
     fontp->charset = -1;
     charset = xlfd_charset_of_font (fontname);
 
diff --git a/src/w32term.c b/src/w32term.c
index 7208a8acf7e..9ed4eb3b64e 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,5 +1,5 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
-   Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001
+   Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001, 2005
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -846,8 +846,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 *,
                                 struct charset *, int *));
 
@@ -985,7 +984,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;
@@ -5446,7 +5445,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 e0a8427668b..27aa8102290 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4688,7 +4688,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);
 
@@ -4728,9 +4729,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));
diff --git a/src/xdisp.c b/src/xdisp.c
index 1ccdf147485..a8b8315e251 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.
 
@@ -319,6 +319,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;
 
@@ -346,7 +350,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.  */
@@ -3268,6 +3271,7 @@ 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.  */
@@ -5007,6 +5011,7 @@ 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;
@@ -5038,8 +5043,9 @@ get_next_display_element (it)
                        || (it->c != '\n' && it->c != '\t'))
                     : (it->multibyte_p
                        ? (!CHAR_PRINTABLE_P (it->c)
-                          || it->c == 0xA0 /* NO-BREAK SPACE */
-                          || it->c == 0xAD /* SOFT HYPHEN */)
+                          || (!NILP (Vshow_nonbreak_escape)
+                              && (it->c == 0xA0 /* NO-BREAK SPACE */
+                                  || it->c == 0xAD /* SOFT HYPHEN */)))
                        : (it->c >= 127
                           && (! unibyte_display_via_language_environment
                               || (UNIBYTE_CHAR_HAS_MULTIBYTE_P (it->c)))))))
@@ -5051,21 +5057,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)
                 {
@@ -5073,62 +5066,83 @@ 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 == 0xA0 || it->c == 0xAD)
+
+              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 == 0xAD ? '-' : ' ', face_id);
+              if (it->c == 0xA0 || it->c == 0xAD)
+                {
+                  XSETINT (it->ctl_chars[0], escape_glyph);
+                  g = it->c == 0xAD ? '-' : ' ';
                   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 (CHAR_BYTE8_P (it->c))
-                    {
-                      str[0] = CHAR_TO_BYTE8 (it->c);
-                      len = 1;
-                    }
-                  else if (it->c < 256)
-                    {
-                      str[0] = it->c;
-                      len = 1;
-                    }
-                  else
-                    {
-                      /* 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 (CHAR_BYTE8_P (it->c))
+                  {
+                    str[0] = CHAR_TO_BYTE8 (it->c);
+                    len = 1;
+                  }
+                else if (it->c < 256)
+                  {
+                    str[0] = it->c;
+                    len = 1;
+                  }
+                else
+                  {
+                    /* 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;
@@ -5136,29 +5150,28 @@ get_next_display_element (it)
                       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 = 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;
@@ -5288,9 +5301,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);
@@ -5299,6 +5309,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)
@@ -5378,7 +5391,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]);
@@ -5388,13 +5400,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
@@ -11766,9 +11779,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);
@@ -16071,22 +16081,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;
@@ -16095,37 +16113,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.
@@ -16148,7 +16166,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);
@@ -22498,6 +22516,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 f866b448d49..468b31ce5d5 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7881,6 +7881,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/xmenu.c b/src/xmenu.c
index 83b8fe91e9e..850b8f4ddf4 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 38547ea6bbf..5dd63b9c735 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1383,7 +1383,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");
     }
@@ -2468,7 +2468,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.  */
 
@@ -2492,7 +2492,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))
@@ -2597,7 +2597,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
@@ -2729,7 +2729,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.h b/src/xterm.h
index e949fced7d8..cf2583981f0 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;