Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-234
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-235
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-236
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-237
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-238
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-239
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-240
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-241
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-242
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-243
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-244
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-245
   (Ffield_beginning, find_field): Undo change of 2006-04-23.

 * emacs@sv.gnu.org/emacs--devo--0--patch-246
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-247
   Rcirc patch from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-248
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-249
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-250
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-251
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-87
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-88
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-89
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-90
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-91
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-92
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-93
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-94
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-95
   Update from CVS

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

17 files changed, 464 insertions, 156 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index d40286f8679..ea9bf3f6092 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -88,15 +88,13 @@ end
 # Print out s-expressions from tool bar
 define pp1
   set $tmp = $arg0
-  echo $arg0
-  printf " = "
   set $output_debug = print_output_debug_flag
   set print_output_debug_flag = 0
   set safe_debug_print ($tmp)
   set print_output_debug_flag = $output_debug
 end
 document pp1
-Print the argument as an emacs s-expression
+Print the argument as an emacs s-expression.
 Works only when an inferior emacs is executing.
 For use on tool bar when debugging in Emacs
 where the variable name would not otherwise
@@ -119,8 +117,6 @@ end
 # Print value of lisp variable
 define pv1
   set $tmp = "$arg0"
-  echo $arg0
-  printf " = "
   set $output_debug = print_output_debug_flag
   set print_output_debug_flag = 0
   set safe_debug_print (find_symbol_value (intern ($tmp)))
@@ -129,9 +125,8 @@ end
 document pv1
 Print the value of the lisp variable given as argument.
 Works only when an inferior emacs is executing.
-For use on tool bar when debugging in Emacs
-where the variable name would not otherwise
-be recorded in the GUD buffer.
+For use when debugging in Emacs where the variable
+name would not otherwise be recorded in the GUD buffer.
 end
 
 # Print out current buffer point and boundaries
diff --git a/src/ChangeLog b/src/ChangeLog
index f0f504e6e64..a4d458bee0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,128 @@
+2006-04-27  Nick Roberts  <nickrob@snap.net.nz>
+
+        * .gdbinit (pp1, pv1): Only print value as expression is now
+        printed out by gud-print.
+        (pv1): Correct doc string.
+
+2006-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (store_in_keymap): Change `def' arg to not be `register'.
+        Seems to trigger a bug in gcc-amd64 4.0.2 20051125 (Red Hat 4.0.2-8):
+        keymap.c:895: error: address of register variable `def' requested.
+
+2006-04-26  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (construct_mouse_wheel): Handle negative coordinates.
+
+        * w32fns.c (w32_wnd_proc) <WM_LBUTTONDOWN, WM_RBUTTONDOWN>:
+        <WM_LBUTTONUP, WM_RBUTTONUP>: Call signal_user_input in the cases
+        where we preempt mouse_button_timer.
+
+2006-04-25  Miles Bader  <miles@gnu.org>
+
+        * editfns.c (Ffield_beginning, find_field): Undo change of 2006-04-23.
+
+2006-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * process.h: Include headers for pid_t.
+
+2006-04-24  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (fill_stretch_glyph_string): Set s->nchars = 1 for code which
+        does last_glyph=s->first_glyph+s->nchars-1, e.g. if stretch has relief.
+        (produce_stretch_glyph): Assume that face box height and width is
+        already included in in stretch glyph size so caller doesn't have to
+        consider the extra space otherwise added (fixes problem in ses.el).
+
+        * frame.c (x_set_font): Clear f->n_tool_bar_rows and current frame
+        matrices to force recalculation of tool-bar height after font change.
+
+        * xdisp.c (tool_bar_lines_needed): New local `temp_row' for clarity.
+        Clear it when done, so we don't accidentally draw a second copy of
+        the tool-bar after resetting f->n_tool_bar_rows.
+        (redisplay_tool_bar): Update tool-bar-lines frame parameter whenever
+        we recalculate f->n_tool_bar_rows.
+
+2006-04-23  Lars Hansen  <larsh@soem.dk>
+
+        * editfns.c (find_field): Fix comment.
+        (Ffield_beginning): Fix bug when POS is at field beginning.
+
+2006-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * puresize.h (BASE_PURESIZE): Increase to 1205000.
+
+2006-04-21  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Fix last change.  Don't recenter if
+        window start is at BEGV.
+
+        * dispextern.h (struct image): New member `corners'.
+        (TOP_CORNER, LEFT_CORNER, BOT_CORNER, RIGHT_CORNER): New macros.
+
+        * image.c (four_corners_best): New arg CORNERS specifies what pixels
+        to look at in case image has margin.
+        (x_create_bitmap_mask): Pass NULL for CORNERS to four_corners_best.
+        (image_background, image_background_transparent)
+        (x_build_heuristic_mask): Pass img->corners to four_corners_best.
+        (gif_load): Set img->corners according to image's margin spec.
+        Use img->corners values directly where applicable.
+        Save image extension data in img->data.lisp_val.
+        (gif_clear_image): New function to free img->data.lisp_val.
+        (gif_type): Use it instead of generic x_clear_image.
+        (Fimage_extension_data): New defun.
+        (syms_of_image): Defsubr it.
+
+2006-04-21  John Sullivan  <john@wjsullivan.net>  (tiny change)
+
+        * window.c (Fdisplay_buffer): Doc fix.
+
+2006-04-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h (SYSTEM_PURESIZE_EXTRA): Increase to 25000.
+
+2006-04-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OS] (xpm_load_image): Fill in background field
+        while we have ximg handy.
+
+        * macmenu.c (restore_menu_items, save_menu_items): New functions
+        from xmenu.c.
+        (set_frame_menubar, digest_single_submenu): Apply 2006-04-18
+        changes for xmenu.c.
+
+        * macterm.c (x_per_char_metric): Return NULL if glyph width is 0.
+        (add_mac_font_name): New function.
+        (init_font_name_table): Use it.  Adopt the first found font from
+        those having the same family name.
+
+2006-04-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * xdisp.c (note_mouse_highlight): Use build_string.
+
+2006-04-20  Lars Hansen  <larsh@soem.dk>
+
+        * textprop.c (Fremove_list_of_text_properties):
+        Ensure modify_region is called only when buffer is modified and that
+        signal_after_change is allways called in that case.
+
+        * print.c (PRINTFINISH): Call signal_after_change.
+
+2006-04-20  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Fix last change.
+
+        * xdisp.c (redisplay_window): If current window start is not at the
+        beginning of a line, select a new window start if buffer is modified
+        and window start is in the modified region, but the first change is
+        before window start.
+
 2006-04-18  Richard Stallman  <rms@gnu.org>
 
         * xmenu.c (restore_menu_items, save_menu_items): New fns.
         (set_frame_menubar): Use save_menu_items.  Save updated vector in
-        the frame before unwinding it.  Don't use unuse_menu_items.  Don't
-        use discard_menu_items.
+        the frame before unwinding it.  Don't use unuse_menu_items.
+        Don't use discard_menu_items.
         (digest_single_submenu): Abort if an item is not in a pane.
         (init_menu_items): Put the error check at the top.
 
@@ -30,8 +149,8 @@
 
         * macterm.c (XCreateGC, x_per_char_metric, xlfdpat_create)
         (init_font_name_table, init_font_name_table, mac_do_list_fonts)
-        (XLoadQueryFont, mac_store_apple_event): Don't check
-        return value of xmalloc.
+        (XLoadQueryFont, mac_store_apple_event): Don't check return value
+        of xmalloc.
 
 2006-04-17  Kim F. Storm  <storm@cua.dk>
 
@@ -75,8 +194,7 @@
 2006-04-13  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (setup_coding_system): Fix previous change.
-        (encode_coding): If eol_type is not yet decided, use
-        system_eol_type.
+        (encode_coding): If eol_type is not yet decided, use system_eol_type.
         (shrink_encoding_region): If eol_type is not yet decided and
         system_eol_type is not LF, don't shrink.
 
@@ -176,8 +294,8 @@
         within ||.  Add explicit braces to avoid ambiguous `else'.
         (dump_glyph_row): Remove label for `inverse_p' from legend.
 
-        * xfaces.c (Finternal_merge_in_global_face, try_font_list): Add
-        explicit braces to avoid ambiguous `else'.
+        * xfaces.c (Finternal_merge_in_global_face, try_font_list):
+        Add explicit braces to avoid ambiguous `else'.
 
 2006-04-11  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>  (tiny change)
 
@@ -886,11 +1004,6 @@
         (mac_set_clip_rectangles): When resetting clip region, make it
         empty instead of disposing of it.
 
-2006-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * keymap.c (store_in_keymap): Change `def' arg to not be `register'.
-        Seems to trigger a bug in gcc-amd64 4.0.2 20051125 (Red Hat 4.0.2-8).
-
 2006-02-20  Kim F. Storm  <storm@cua.dk>
 
         * Makefile.in: Add fringe.elc to WINDOW_SUPPORT.
diff --git a/src/dispextern.h b/src/dispextern.h
index 137b1d4dee2..c836bc751d0 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2412,6 +2412,15 @@ struct image
 #define DEFAULT_IMAGE_WIDTH 30
 #define DEFAULT_IMAGE_HEIGHT 30
 
+  /* Top/left and bottom/right corner pixel of actual image data.
+     Used by four_corners_best to consider the real image data,
+     rather than looking at the optional image margin.  */
+  int corners[4];
+#define TOP_CORNER 0
+#define LEFT_CORNER 1
+#define BOT_CORNER 2
+#define RIGHT_CORNER 3
+
   /* Percent of image height used as ascent.  A value of
      CENTERED_IMAGE_ASCENT means draw the image centered on the
      line.  */
diff --git a/src/editfns.c b/src/editfns.c
index 450a7684584..b74fd2a41c2 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -491,7 +491,7 @@ get_pos_property (position, prop, object)
 }
 
 /* Find the field surrounding POS in *BEG and *END.  If POS is nil,
-   the value of point is used instead.  If BEG or END null,
+   the value of point is used instead.  If BEG or END is null,
    means don't store the beginning or end of the field.
 
    BEG_LIMIT and END_LIMIT serve to limit the ranged of the returned
diff --git a/src/frame.c b/src/frame.c
index 988b1436936..04a663f9388 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3399,6 +3399,11 @@ x_set_font (f, arg, oldval)
       else if (!NILP (Fequal (result, oldval)))
         return;
 
+      /* Recalculate toolbar height.  */
+      f->n_tool_bar_rows = 0;
+      /* Ensure we redraw it.  */
+      clear_current_matrices (f);
+
       store_frame_param (f, Qfont, result);
       recompute_basic_faces (f);
     }
diff --git a/src/image.c b/src/image.c
index a6b3c8f19c5..eae25fdb02e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -603,7 +603,9 @@ x_destroy_all_bitmaps (dpyinfo)
 /* Useful functions defined in the section
    `Image type independent image structures' below. */
 
-static unsigned long four_corners_best P_ ((XImagePtr ximg, unsigned long width,
+static unsigned long four_corners_best P_ ((XImagePtr ximg,
+                                            int *corners,
+                                            unsigned long width,
                                             unsigned long height));
 
 static int x_create_x_image_and_pixmap P_ ((struct frame *f, int width, int height,
@@ -657,7 +659,7 @@ x_create_bitmap_mask (f, id)
       return -1;
     }
 
-  bg = four_corners_best (ximg, width, height);
+  bg = four_corners_best (ximg, NULL, width, height);
 
   for (y = 0; y < ximg->height; ++y)
     {
@@ -732,7 +734,7 @@ Lisp_Object Qxbm;
 /* Keywords.  */
 
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
-extern Lisp_Object QCdata, QCtype;
+extern Lisp_Object QCdata, QCtype, Qcount;
 extern Lisp_Object Qcenter;
 Lisp_Object QCascent, QCmargin, QCrelief;
 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
@@ -1141,6 +1143,27 @@ or omitted means use the selected frame.  */)
   return mask;
 }
 
+DEFUN ("image-extension-data", Fimage_extension_data, Simage_extension_data, 1, 2, 0,
+       doc: /* Return extension data for image SPEC.
+FRAME is the frame on which the image will be displayed.  FRAME nil
+or omitted means use the selected frame.  */)
+     (spec, frame)
+     Lisp_Object spec, frame;
+{
+  Lisp_Object ext;
+
+  ext = Qnil;
+  if (valid_image_p (spec))
+    {
+      struct frame *f = check_x_frame (frame);
+      int id = lookup_image (f, spec);
+      struct image *img = IMAGE_FROM_ID (f, id);
+      ext = img->data.lisp_val;
+    }
+
+  return ext;
+}
+
 
 /***********************************************************************
                  Image type independent image structures
@@ -1171,6 +1194,7 @@ make_image (spec, hash)
   img->data.lisp_val = Qnil;
   img->ascent = DEFAULT_IMAGE_ASCENT;
   img->hash = hash;
+  img->corners[BOT_CORNER] = -1;  /* Full image */
   return img;
 }
 
@@ -1322,30 +1346,41 @@ image_ascent (img, face, slice)
    On W32, XIMG is assumed to a device context with the bitmap selected.  */
 
 static RGB_PIXEL_COLOR
-four_corners_best (ximg, width, height)
+four_corners_best (ximg, corners, width, height)
      XImagePtr_or_DC ximg;
+     int *corners;
      unsigned long width, height;
 {
-  RGB_PIXEL_COLOR corners[4], best;
+  RGB_PIXEL_COLOR corner_pixels[4], best;
   int i, best_count;
 
-  /* Get the colors at the corners of ximg.  */
-  corners[0] = GET_PIXEL (ximg, 0, 0);
-  corners[1] = GET_PIXEL (ximg, width - 1, 0);
-  corners[2] = GET_PIXEL (ximg, width - 1, height - 1);
-  corners[3] = GET_PIXEL (ximg, 0, height - 1);
-
+  if (corners && corners[BOT_CORNER] >= 0)
+    {
+      /* Get the colors at the corner_pixels of ximg.  */
+      corner_pixels[0] = GET_PIXEL (ximg, corners[LEFT_CORNER], corners[TOP_CORNER]);
+      corner_pixels[1] = GET_PIXEL (ximg, corners[RIGHT_CORNER] - 1, corners[TOP_CORNER]);
+      corner_pixels[2] = GET_PIXEL (ximg, corners[RIGHT_CORNER] - 1, corners[BOT_CORNER] - 1);
+      corner_pixels[3] = GET_PIXEL (ximg, corners[LEFT_CORNER], corners[BOT_CORNER] - 1);
+    }
+  else
+    {
+      /* Get the colors at the corner_pixels of ximg.  */
+      corner_pixels[0] = GET_PIXEL (ximg, 0, 0);
+      corner_pixels[1] = GET_PIXEL (ximg, width - 1, 0);
+      corner_pixels[2] = GET_PIXEL (ximg, width - 1, height - 1);
+      corner_pixels[3] = GET_PIXEL (ximg, 0, height - 1);
+    }
   /* Choose the most frequently found color as background.  */
   for (i = best_count = 0; i < 4; ++i)
     {
       int j, n;
 
       for (j = n = 0; j < 4; ++j)
-        if (corners[i] == corners[j])
+        if (corner_pixels[i] == corner_pixels[j])
           ++n;
 
       if (n > best_count)
-        best = corners[i], best_count = n;
+        best = corner_pixels[i], best_count = n;
     }
 
   return best;
@@ -1404,7 +1439,7 @@ image_background (img, f, ximg)
 #endif /* !HAVE_NTGUI */
         }
 
-      img->background = four_corners_best (ximg, img->width, img->height);
+      img->background = four_corners_best (ximg, img->corners, img->width, img->height);
 
       if (free_ximg)
         Destroy_Image (ximg, prev);
@@ -1449,7 +1484,7 @@ image_background_transparent (img, f, mask)
             }
 
           img->background_transparent
-            = (four_corners_best (mask, img->width, img->height) == PIX_MASK_RETAIN);
+            = (four_corners_best (mask, img->corners, img->width, img->height) == PIX_MASK_RETAIN);
 
           if (free_mask)
             Destroy_Image (mask, prev);
@@ -4462,6 +4497,10 @@ xpm_load_image (f, img, contents, end)
   img->width = width;
   img->height = height;
 
+  /* Maybe fill in the background field while we have ximg handy. */
+  if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
+    IMAGE_BACKGROUND (img, f, ximg);
+
   x_put_x_image (f, ximg, img->pixmap, width, height);
   x_destroy_x_image (ximg);
   if (have_mask)
@@ -5356,7 +5395,7 @@ x_build_heuristic_mask (f, img, how)
     }
 
   if (use_img_background)
-    bg = four_corners_best (ximg, img->width, img->height);
+    bg = four_corners_best (ximg, img->corners, img->width, img->height);
 
   /* Set all bits in mask_img to 1 whose color in ximg is different
      from the background color bg.  */
@@ -7449,6 +7488,7 @@ tiff_load (f, img)
 
 static int gif_image_p P_ ((Lisp_Object object));
 static int gif_load P_ ((struct frame *f, struct image *img));
+static void gif_clear_image P_ ((struct frame *f, struct image *img));
 
 /* The symbol `gif' identifying images of this type.  */
 
@@ -7497,10 +7537,22 @@ static struct image_type gif_type =
   &Qgif,
   gif_image_p,
   gif_load,
-  x_clear_image,
+  gif_clear_image,
   NULL
 };
 
+/* Free X resources of GIF image IMG which is used on frame F.  */
+
+static void
+gif_clear_image (f, img)
+     struct frame *f;
+     struct image *img;
+{
+  /* IMG->data.ptr_val may contain extension data.  */
+  img->data.lisp_val = Qnil;
+  x_clear_image (f, img);
+}
+
 /* Return non-zero if OBJECT is a valid GIF image specification.  */
 
 static int
@@ -7621,7 +7673,7 @@ gif_load (f, img)
   GifFileType *gif;
   struct gcpro gcpro1;
   Lisp_Object image;
-  int ino, image_left, image_top, image_width, image_height;
+  int ino, image_height, image_width;
   gif_memory_source memsrc;
   unsigned char *raster;
 
@@ -7698,17 +7750,19 @@ gif_load (f, img)
       return 0;
     }
 
-  image_top = gif->SavedImages[ino].ImageDesc.Top;
-  image_left = gif->SavedImages[ino].ImageDesc.Left;
-  image_width = gif->SavedImages[ino].ImageDesc.Width;
+  img->corners[TOP_CORNER] = gif->SavedImages[ino].ImageDesc.Top;
+  img->corners[LEFT_CORNER] = gif->SavedImages[ino].ImageDesc.Left;
   image_height = gif->SavedImages[ino].ImageDesc.Height;
+  img->corners[BOT_CORNER] = img->corners[TOP_CORNER] + image_height;
+  image_width = gif->SavedImages[ino].ImageDesc.Width;
+  img->corners[RIGHT_CORNER] = img->corners[LEFT_CORNER] + image_width;
 
   width = img->width = max (gif->SWidth,
                             max (gif->Image.Left + gif->Image.Width,
-                                 image_left + image_width));
+                                 img->corners[RIGHT_CORNER]));
   height = img->height = max (gif->SHeight,
                               max (gif->Image.Top + gif->Image.Height,
-                                   image_top + image_height));
+                                   img->corners[BOT_CORNER]));
 
   if (!check_image_size (f, width, height))
     {
@@ -7751,19 +7805,19 @@ gif_load (f, img)
      requires more than can be done here (see the gif89 spec,
      disposal methods).  Let's simply assume that the part
      not covered by a sub-image is in the frame's background color.  */
-  for (y = 0; y < image_top; ++y)
+  for (y = 0; y < img->corners[TOP_CORNER]; ++y)
     for (x = 0; x < width; ++x)
       XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
 
-  for (y = image_top + image_height; y < height; ++y)
+  for (y = img->corners[BOT_CORNER]; y < height; ++y)
     for (x = 0; x < width; ++x)
       XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
 
-  for (y = image_top; y < image_top + image_height; ++y)
+  for (y = img->corners[TOP_CORNER]; y < img->corners[BOT_CORNER]; ++y)
     {
-      for (x = 0; x < image_left; ++x)
+      for (x = 0; x < img->corners[LEFT_CORNER]; ++x)
         XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
-      for (x = image_left + image_width; x < width; ++x)
+      for (x = img->corners[RIGHT_CORNER]; x < width; ++x)
         XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
     }
 
@@ -7793,8 +7847,8 @@ gif_load (f, img)
           for (x = 0; x < image_width; x++)
             {
               int i = raster[(y * image_width) + x];
-              XPutPixel (ximg, x + image_left, row + image_top,
-                         pixel_colors[i]);
+              XPutPixel (ximg, x + img->corners[LEFT_CORNER],
+                         row + img->corners[TOP_CORNER], pixel_colors[i]);
             }
 
           row += interlace_increment[pass];
@@ -7806,10 +7860,29 @@ gif_load (f, img)
         for (x = 0; x < image_width; ++x)
           {
             int i = raster[y * image_width + x];
-            XPutPixel (ximg, x + image_left, y + image_top, pixel_colors[i]);
+            XPutPixel (ximg, x + img->corners[LEFT_CORNER],
+                       y + img->corners[TOP_CORNER], pixel_colors[i]);
           }
     }
 
+  /* Save GIF image extension data for `image-extension-data'.
+     Format is (count IMAGES FUNCTION "BYTES" ...).  */
+  img->data.lisp_val = Qnil;
+  if (gif->SavedImages[ino].ExtensionBlockCount > 0)
+    {
+      ExtensionBlock *ext = gif->SavedImages[ino].ExtensionBlocks;
+      for (i = 0; i < gif->SavedImages[ino].ExtensionBlockCount; i++, ext++)
+        /* Append (... FUNCTION "BYTES") */
+        img->data.lisp_val = Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount),
+                                    Fcons (make_number (ext->Function),
+                                           img->data.lisp_val));
+      img->data.lisp_val = Fnreverse (img->data.lisp_val);
+    }
+  if (gif->ImageCount > 1)
+    img->data.lisp_val = Fcons (Qcount,
+                                Fcons (make_number (gif->ImageCount),
+                                       img->data.lisp_val));
+
   fn_DGifCloseFile (gif);
 
   /* Maybe fill in the background field while we have ximg handy. */
@@ -8555,6 +8628,7 @@ non-numeric, there is no explicit limit on the size of images.  */);
   defsubr (&Sclear_image_cache);
   defsubr (&Simage_size);
   defsubr (&Simage_mask_p);
+  defsubr (&Simage_extension_data);
 
 #if GLYPH_DEBUG
   defsubr (&Simagep);
diff --git a/src/keymap.c b/src/keymap.c
index 5962dfc2efd..7ff3f471b0f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -859,7 +859,7 @@ static Lisp_Object
 store_in_keymap (keymap, idx, def)
      Lisp_Object keymap;
      register Lisp_Object idx;
-     register Lisp_Object def;
+     Lisp_Object def;
 {
   /* Flush any reverse-map cache.  */
   where_is_cache = Qnil;
diff --git a/src/macmenu.c b/src/macmenu.c
index 29233ec0d64..be565f89259 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -303,6 +303,37 @@ discard_menu_items ()
     }
 }
 
+/* This undoes save_menu_items, and it is called by the specpdl unwind
+   mechanism.  */
+
+static Lisp_Object
+restore_menu_items (saved)
+     Lisp_Object saved;
+{
+  menu_items = XCAR (saved);
+  menu_items_allocated = (VECTORP (menu_items) ? ASIZE (menu_items) : 0);
+  saved = XCDR (saved);
+  menu_items_used = XINT (XCAR (saved));
+  saved = XCDR (saved);
+  menu_items_n_panes = XINT (XCAR (saved));
+  saved = XCDR (saved);  
+  menu_items_submenu_depth = XINT (XCAR (saved));
+}
+
+/* Push the whole state of menu_items processing onto the specpdl.
+   It will be restored when the specpdl is unwound.  */
+
+static void
+save_menu_items ()
+{
+  Lisp_Object saved = list4 (menu_items,
+                             make_number (menu_items_used),
+                             make_number (menu_items_n_panes),
+                             make_number (menu_items_submenu_depth));
+  record_unwind_protect (restore_menu_items, saved);
+  menu_items = Qnil;
+}
+
 /* Make the menu_items vector twice as large.  */
 
 static void
@@ -313,6 +344,7 @@ grow_menu_items ()
   old = menu_items;
 
   menu_items_allocated *= 2;
+
   menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
   bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
          old_size * sizeof (Lisp_Object));
@@ -1185,6 +1217,7 @@ digest_single_submenu (start, end, top_level_items)
   int i;
   int submenu_depth = 0;
   widget_value **submenu_stack;
+  int panes_seen = 0;
 
   submenu_stack
     = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));
@@ -1231,6 +1264,8 @@ digest_single_submenu (start, end, top_level_items)
           Lisp_Object pane_name, prefix;
           char *pane_string;
 
+          panes_seen++;
+
           pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
           prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
 
@@ -1278,6 +1313,10 @@ digest_single_submenu (start, end, top_level_items)
           Lisp_Object item_name, enable, descrip, def, type, selected;
           Lisp_Object help;
 
+          /* All items should be contained in panes.  */
+          if (panes_seen == 0)
+            abort ();
+
           item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
           enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
           descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
@@ -1529,6 +1568,8 @@ set_frame_menubar (f, first_time, deep_p)
 
       /* Fill in menu_items with the current menu bar contents.
          This can evaluate Lisp code.  */
+      save_menu_items ();
+
       menu_items = f->menu_bar_vector;
       menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
       submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *));
@@ -1588,23 +1629,33 @@ set_frame_menubar (f, first_time, deep_p)
         }
 
       set_buffer_internal_1 (prev);
-      unbind_to (specpdl_count, Qnil);
 
       /* If there has been no change in the Lisp-level contents
          of the menu bar, skip redisplaying it.  Just exit.  */
 
+      /* Compare the new menu items with the ones computed last time.  */
       for (i = 0; i < previous_menu_items_used; i++)
         if (menu_items_used == i
             || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])))
           break;
       if (i == menu_items_used && i == previous_menu_items_used && i != 0)
         {
+          /* The menu items have not changed.  Don't bother updating
+             the menus in any form, since it would be a no-op.  */
           free_menubar_widget_value_tree (first_wv);
           discard_menu_items ();
-
+          unbind_to (specpdl_count, Qnil);
           return;
         }
 
+      /* The menu items are different, so store them in the frame.  */
+      f->menu_bar_vector = menu_items;
+      f->menu_bar_items_used = menu_items_used;
+
+      /* This calls restore_menu_items to restore menu_items, etc.,
+         as they were outside.  */
+      unbind_to (specpdl_count, Qnil);
+
       /* Now GC cannot happen during the lifetime of the widget_value,
          so it's safe to store data from a Lisp_String.  */
       wv = first_wv->contents;
@@ -1619,9 +1670,6 @@ set_frame_menubar (f, first_time, deep_p)
           wv = wv->next;
         }
 
-      f->menu_bar_vector = menu_items;
-      f->menu_bar_items_used = menu_items_used;
-      discard_menu_items ();
     }
   else
     {
diff --git a/src/macterm.c b/src/macterm.c
index 5696f13e5a0..6c47e2f932f 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -2230,7 +2230,11 @@ x_per_char_metric (font, char2b)
 #endif
 
   return ((pcm == NULL
-           || (pcm->width == 0 && (pcm->rbearing - pcm->lbearing) == 0))
+           || (pcm->width == 0
+#if 0 /* Show hollow boxes for zero-width glyphs such as combining diacritics.  */
+               && (pcm->rbearing - pcm->lbearing) == 0
+#endif
+               ))
           ? NULL : pcm);
 }
 
@@ -7042,6 +7046,25 @@ add_font_name_table_entry (char *font_name)
   font_name_table[font_name_count++] = font_name;
 }
 
+static void
+add_mac_font_name (name, size, style, charset)
+     char *name;
+     int size;
+     Style style;
+     char *charset;
+{
+  if (size > 0)
+    add_font_name_table_entry (mac_to_x_fontname (name, size, style, charset));
+  else
+    {
+      add_font_name_table_entry (mac_to_x_fontname (name, 0, style, charset));
+      add_font_name_table_entry (mac_to_x_fontname (name, 0, italic, charset));
+      add_font_name_table_entry (mac_to_x_fontname (name, 0, bold, charset));
+      add_font_name_table_entry (mac_to_x_fontname (name, 0, italic | bold,
+                                                    charset));
+    }
+}
+
 /* Sets up the table font_name_table to contain the list of all fonts
    in the system the first time the table is used so that the Resource
    Manager need not be accessed every time this information is
@@ -7067,16 +7090,21 @@ init_font_name_table ()
                            text_encoding_info_alist)))
     {
       OSErr err;
+      struct Lisp_Hash_Table *h;
+      unsigned hash_code;
       ItemCount nfonts, i;
       ATSUFontID *font_ids = NULL;
-      Ptr name, prev_name = NULL;
+      Ptr name;
       ByteCount name_len;
+      Lisp_Object family;
 
       atsu_font_id_hash =
         make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE),
                          make_float (DEFAULT_REHASH_SIZE),
                          make_float (DEFAULT_REHASH_THRESHOLD),
                          Qnil, Qnil, Qnil);;
+      h = XHASH_TABLE (atsu_font_id_hash);
+
       err = ATSUFontCount (&nfonts);
       if (err == noErr)
         {
@@ -7098,32 +7126,19 @@ init_font_name_table ()
                                     kFontNoLanguage, name_len, name,
                                     NULL, NULL);
             if (err == noErr)
-              decode_mac_font_name (name, name_len + 1, Qnil);
-            if (err == noErr
-                && *name != '.'
-                && (prev_name == NULL
-                    || strcmp (name, prev_name) != 0))
               {
-                static char *cs = "iso10646-1";
-
-                add_font_name_table_entry (mac_to_x_fontname (name, 0,
-                                                              normal, cs));
-                add_font_name_table_entry (mac_to_x_fontname (name, 0,
-                                                              italic, cs));
-                add_font_name_table_entry (mac_to_x_fontname (name, 0,
-                                                              bold, cs));
-                add_font_name_table_entry (mac_to_x_fontname (name, 0,
-                                                              italic | bold, cs));
-                Fputhash (make_unibyte_string (name, name_len),
-                          long_to_cons (font_ids[i]), atsu_font_id_hash);
-                xfree (prev_name);
-                prev_name = name;
+                decode_mac_font_name (name, name_len + 1, Qnil);
+                family = make_unibyte_string (name, name_len);
+                if (*name != '.'
+                    && hash_lookup (h, family, &hash_code) < 0)
+                  {
+                    add_mac_font_name (name, 0, normal, "iso10646-1");
+                    hash_put (h, family, long_to_cons (font_ids[i]),
+                              hash_code);
+                  }
               }
-            else
-              xfree (name);
+            xfree (name);
           }
-      if (prev_name)
-        xfree (prev_name);
       if (font_ids)
         xfree (font_ids);
     }
@@ -7151,16 +7166,16 @@ init_font_name_table ()
       FMFontSize size;
       TextEncoding encoding;
       TextEncodingBase sc;
-      Lisp_Object text_encoding_info;
+      Lisp_Object text_encoding_info, family;
 
       if (FMGetFontFamilyName (ff, name) != noErr)
-        break;
+        continue;
       p2cstr (name);
       if (*name == '.')
         continue;
 
       if (FMGetFontFamilyTextEncoding (ff, &encoding) != noErr)
-        break;
+        continue;
       sc = GetTextEncodingBase (encoding);
       text_encoding_info = assq_no_quit (make_number (sc),
                                          text_encoding_info_alist);
@@ -7169,13 +7184,15 @@ init_font_name_table ()
                                            text_encoding_info_alist);
       decode_mac_font_name (name, sizeof (name),
                             XCAR (XCDR (text_encoding_info)));
-      fm_font_family_alist = Fcons (Fcons (build_string (name),
-                                           make_number (ff)),
+      family = build_string (name);
+      if (!NILP (Fassoc (family, fm_font_family_alist)))
+        continue;
+      fm_font_family_alist = Fcons (Fcons (family, make_number (ff)),
                                     fm_font_family_alist);
 
       /* Point the instance iterator at the current font family.  */
       if (FMResetFontFamilyInstanceIterator (ff, &ffii) != noErr)
-        break;
+        continue;
 
       while (FMGetNextFontFamilyInstance (&ffii, &font, &style, &size)
              == noErr)
@@ -7184,27 +7201,7 @@ init_font_name_table ()
 
           if (size > 0 || style == normal)
             for (; !NILP (rest); rest = XCDR (rest))
-              {
-                char *cs = SDATA (XCAR (rest));
-
-                if (size == 0)
-                  {
-                    add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                  style, cs));
-                    add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                  italic, cs));
-                    add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                  bold, cs));
-                    add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                  italic | bold,
-                                                                  cs));
-                  }
-                else
-                  {
-                    add_font_name_table_entry (mac_to_x_fontname (name, size,
-                                                                  style, cs));
-                  }
-              }
+              add_mac_font_name (name, size, style, SDATA (XCAR (rest)));
         }
     }
 
@@ -7224,7 +7221,7 @@ init_font_name_table ()
   Str255 name;
   struct FontAssoc *fat;
   struct AsscEntry *assc_entry;
-  Lisp_Object text_encoding_info_alist, text_encoding_info;
+  Lisp_Object text_encoding_info_alist, text_encoding_info, family;
   struct gcpro gcpro1;
 
   GetPort (&port);  /* save the current font number used */
@@ -7243,7 +7240,7 @@ init_font_name_table ()
       GetResInfo (font_handle, &id, &type, name);
       GetFNum (name, &fontnum);
       p2cstr (name);
-      if (fontnum == 0)
+      if (fontnum == 0 || *name == '.')
         continue;
 
       TextFont (fontnum);
@@ -7255,8 +7252,10 @@ init_font_name_table ()
                                            text_encoding_info_alist);
       decode_mac_font_name (name, sizeof (name),
                             XCAR (XCDR (text_encoding_info)));
-      fm_font_family_alist = Fcons (Fcons (build_string (name),
-                                           make_number (fontnum)),
+      family = build_string (name);
+      if (!NILP (Fassoc (family, fm_font_family_alist)))
+        continue;
+      fm_font_family_alist = Fcons (Fcons (family, make_number (fontnum)),
                                     fm_font_family_alist);
       do
         {
@@ -7277,14 +7276,9 @@ init_font_name_table ()
                   Lisp_Object rest = XCDR (XCDR (text_encoding_info));
 
                   for (; !NILP (rest); rest = XCDR (rest))
-                    {
-                      char *cs = SDATA (XCAR (rest));
-
-                      add_font_name_table_entry (mac_to_x_fontname (name,
-                                                                    assc_entry->fontSize,
-                                                                    assc_entry->fontStyle,
-                                                                    cs));
-                    }
+                    add_mac_font_name (name, assc_entry->fontSize,
+                                       assc_entry->fontStyle,
+                                       SDATA (XCAR (rest)));
                 }
             }
 
diff --git a/src/print.c b/src/print.c
index 12960ef214d..0a560dbc2d9 100644
--- a/src/print.c
+++ b/src/print.c
@@ -275,6 +275,7 @@ int print_output_debug_flag = 1;
        else                                                             \
          insert_1_both (print_buffer, print_buffer_pos,                 \
                         print_buffer_pos_byte, 0, 1, 0);                \
+       signal_after_change (PT - print_buffer_pos, 0, print_buffer_pos);\
      }                                                                  \
    if (free_print_buffer)                                               \
      {                                                                  \
diff --git a/src/process.h b/src/process.h
index c4b4281fedf..b585515d6b1 100644
--- a/src/process.h
+++ b/src/process.h
@@ -19,6 +19,12 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 /* This structure records information about a subprocess
    or network connection.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 55f62644d04..fa4ca565171 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -466,9 +466,9 @@ extern char *get_emacs_configuration_options (void);
 #include <string.h>
 
 /* We need a little extra space, see ../../lisp/loadup.el.
-   The number below comes from 22038 bytes worth (as of 2006-04)
-   of w32-specific files loaded by loadup.el, plus 2K spare.  */
-#define SYSTEM_PURESIZE_EXTRA 24000
+   The number below comes from 23923 bytes worth (as of 2006-04)
+   of w32-specific files loaded by loadup.el, plus 1K spare.  */
+#define SYSTEM_PURESIZE_EXTRA 25000
 
 /* For unexec to work on Alpha systems, we need to put Emacs'
    initialized data into a separate section from the CRT initialized
diff --git a/src/textprop.c b/src/textprop.c
index 65823d9fa3f..e2f9c531735 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1602,10 +1602,12 @@ Return t if any property was actually removed, nil otherwise.  */)
         }
     }
 
-  if (BUFFERP (object))
-    modify_region (XBUFFER (object), XINT (start), XINT (end));
-
-  /* We are at the beginning of an interval, with len to scan */
+  /* We are at the beginning of an interval, with len to scan.
+     The flag `modified' records if changes have been made.
+     When object is a buffer, we must call modify_region before changes are
+     made and signal_after_change when we are done.
+     We call modify_region before calling remove_properties iff modified == 0,
+     and we call signal_after_change before returning iff modified != 0. */
   for (;;)
     {
       if (i == 0)
@@ -1614,10 +1616,20 @@ Return t if any property was actually removed, nil otherwise.  */)
       if (LENGTH (i) >= len)
         {
           if (! interval_has_some_properties_list (properties, i))
-            return modified ? Qt : Qnil;
+            if (modified)
+              {
+                if (BUFFERP (object))
+                  signal_after_change (XINT (start), XINT (end) - XINT (start),
+                                       XINT (end) - XINT (start));
+                return Qt;
+              }
+            else
+              return Qnil;
 
           if (LENGTH (i) == len)
             {
+              if (!modified && BUFFERP (object))
+                modify_region (XBUFFER (object), XINT (start), XINT (end));
               remove_properties (Qnil, properties, i, object);
               if (BUFFERP (object))
                 signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1629,6 +1641,8 @@ Return t if any property was actually removed, nil otherwise.  */)
           unchanged = i;
           i = split_interval_left (i, len);
           copy_properties (unchanged, i);
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
           remove_properties (Qnil, properties, i, object);
           if (BUFFERP (object))
             signal_after_change (XINT (start), XINT (end) - XINT (start),
@@ -1636,8 +1650,14 @@ Return t if any property was actually removed, nil otherwise.  */)
           return Qt;
         }
 
+      if (interval_has_some_properties_list (properties, i))
+        {
+          if (!modified && BUFFERP (object))
+            modify_region (XBUFFER (object), XINT (start), XINT (end));
+          remove_properties (Qnil, properties, i, object);
+          modified = 1;
+        }
       len -= LENGTH (i);
-      modified += remove_properties (Qnil, properties, i, object);
       i = next_interval (i);
     }
 }
diff --git a/src/w32fns.c b/src/w32fns.c
index 093739d1603..609a88debbd 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3190,6 +3190,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
               }
             wmsg.dwModifiers = w32_get_modifiers ();
             my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+            signal_user_input ();
 
             /* Clear message buffer. */
             saved_mouse_button_msg.msg.hwnd = 0;
@@ -3247,6 +3248,7 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
           }
         wmsg.dwModifiers = w32_get_modifiers ();
         my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+        signal_user_input ();
 
         /* Always clear message buffer and cancel timer. */
         saved_mouse_button_msg.msg.hwnd = 0;
diff --git a/src/w32term.c b/src/w32term.c
index 465dc780322..05fd303f4d1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3131,8 +3131,10 @@ construct_mouse_wheel (result, msg, f)
   result->modifiers = (msg->dwModifiers
                        | ((delta < 0 ) ? down_modifier : up_modifier));
 
-  p.x = LOWORD (msg->msg.lParam);
-  p.y = HIWORD (msg->msg.lParam);
+  /* With multiple monitors, we can legitimately get negative
+     coordinates, so cast to short to interpret them correctly.  */
+  p.x = (short) LOWORD (msg->msg.lParam);
+  p.y = (short) HIWORD (msg->msg.lParam);
   ScreenToClient (msg->msg.hwnd, &p);
   XSETINT (result->x, p.x);
   XSETINT (result->y, p.y);
diff --git a/src/window.c b/src/window.c
index 61b85e5ad22..966960edd90 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3439,7 +3439,7 @@ displaying BUFFER, then simply raise that frame.
 The variables `special-display-buffer-names',
 `special-display-regexps', `same-window-buffer-names', and
 `same-window-regexps' customize how certain buffer names are handled.
-The latter two take effect only if NOT-THIS-WINDOW is t.
+The latter two take effect only if NOT-THIS-WINDOW is nil.
 
 If optional argument FRAME is `visible', search all visible frames.
 If FRAME is 0, search all visible and iconified frames.
diff --git a/src/xdisp.c b/src/xdisp.c
index 80b9ff6c8f6..25dd0ffce3d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9563,20 +9563,22 @@ tool_bar_lines_needed (f, n_rows)
 {
   struct window *w = XWINDOW (f->tool_bar_window);
   struct it it;
+  struct glyph_row *temp_row = w->desired_matrix->rows;
 
   /* Initialize an iterator for iteration over
      F->desired_tool_bar_string in the tool-bar window of frame F.  */
-  init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID);
+  init_iterator (&it, w, -1, -1, temp_row, TOOL_BAR_FACE_ID);
   it.first_visible_x = 0;
   it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
   while (!ITERATOR_AT_END_P (&it))
     {
-      it.glyph_row = w->desired_matrix->rows;
-      clear_glyph_row (it.glyph_row);
+      clear_glyph_row (temp_row);
+      it.glyph_row = temp_row;
       display_tool_bar_line (&it, -1);
     }
+  clear_glyph_row (temp_row);
 
   /* f->n_tool_bar_rows == 0 means "unknown"; -1 means no tool-bar.  */
   if (n_rows)
@@ -9656,7 +9658,29 @@ redisplay_tool_bar (f)
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
   if (f->n_tool_bar_rows == 0)
-    (void)tool_bar_lines_needed (f, &f->n_tool_bar_rows);
+    {
+      int nlines;
+
+      if ((nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows),
+           nlines != WINDOW_TOTAL_LINES (w)))
+        {
+          extern Lisp_Object Qtool_bar_lines;
+          Lisp_Object frame;
+          int old_height = WINDOW_TOTAL_LINES (w);
+
+          XSETFRAME (frame, f);
+          clear_glyph_matrix (w->desired_matrix);
+          Fmodify_frame_parameters (frame,
+                                    Fcons (Fcons (Qtool_bar_lines,
+                                                  make_number (nlines)),
+                                           Qnil));
+          if (WINDOW_TOTAL_LINES (w) != old_height)
+            {
+              fonts_changed_p = 1;
+              return 1;
+            }
+        }
+    }
 
   /* Display as many lines as needed to display all tool-bar items.  */
 
@@ -12697,8 +12721,6 @@ redisplay_window (window, just_this_one_p)
       /* IT may overshoot PT if text at PT is invisible.  */
       else if (IT_CHARPOS (it) > PT && CHARPOS (startp) <= PT)
         w->force_start = Qt;
-
-
     }
 
   /* Handle case where place to start displaying has been specified,
@@ -12868,6 +12890,36 @@ redisplay_window (window, just_this_one_p)
                || (XFASTINT (w->last_modified) >= MODIFF
                    && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
     {
+
+      /* If first window line is a continuation line, and window start
+         is inside the modified region, but the first change is before
+         current window start, we must select a new window start.*/
+      if (NILP (w->start_at_line_beg)
+          && CHARPOS (startp) > BEGV)
+        {
+          /* Make sure beg_unchanged and end_unchanged are up to date.
+             Do it only if buffer has really changed.  This may or may
+             not have been done by try_window_id (see which) already. */
+          if (MODIFF > SAVE_MODIFF
+              /* This seems to happen sometimes after saving a buffer.  */
+              || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE)
+            {
+              if (GPT - BEG < BEG_UNCHANGED)
+                BEG_UNCHANGED = GPT - BEG;
+              if (Z - GPT < END_UNCHANGED)
+                END_UNCHANGED = Z - GPT;
+            }
+
+          if (CHARPOS (startp) > BEG + BEG_UNCHANGED
+              && CHARPOS (startp) <= Z - END_UNCHANGED)
+            {
+              /* There doesn't seems to be a simple way to find a new
+                 window start that is near the old window start, so
+                 we just recenter.  */
+              goto recenter;
+            }
+        }
+
 #if GLYPH_DEBUG
       debug_method_add (w, "same window start");
 #endif
@@ -18694,6 +18746,7 @@ fill_stretch_glyph_string (s, row, area, start, end)
   s->font = s->face->font;
   s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id);
   s->width = glyph->pixel_width;
+  s->nchars = 1;
   voffset = glyph->voffset;
 
   for (++glyph;
@@ -19839,20 +19892,6 @@ produce_stretch_glyph (it)
   it->descent = it->phys_descent = height - it->ascent;
   it->nglyphs = width > 0 && height > 0 ? 1 : 0;
 
-  if (width > 0 && height > 0 && face->box != FACE_NO_BOX)
-    {
-      if (face->box_line_width > 0)
-        {
-          it->ascent += face->box_line_width;
-          it->descent += face->box_line_width;
-        }
-
-      if (it->start_of_box_run_p)
-        it->pixel_width += abs (face->box_line_width);
-      if (it->end_of_box_run_p)
-        it->pixel_width += abs (face->box_line_width);
-    }
-
   take_vertical_position_into_account (it);
 }
 
@@ -22373,7 +22412,7 @@ note_mouse_highlight (f, x, y)
   if (part == ON_VERTICAL_BORDER)
     {
       cursor = FRAME_X_OUTPUT (f)->horizontal_drag_cursor;
-      help_echo_string = make_string ("drag-mouse-1: resize", 20);
+      help_echo_string = build_string ("drag-mouse-1: resize");
     }
   else if (part == ON_LEFT_FRINGE || part == ON_RIGHT_FRINGE
            || part == ON_SCROLL_BAR)