Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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


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

18 files changed, 802 insertions, 341 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index babc20c57c5..6bc622c8bff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,110 @@
+2004-04-23  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (Finternal_char_font): If POSITION is nil, return
+        font for displaying CH with the default face.
+
+2004-04-23  Juanma Barranquero  <lektu@terra.es>
+
+        * makefile.w32-in: Add "-*- makefile -*-" mode tag.
+
+2004-04-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (XINT) [EXPLICIT_SIGN_EXTEND && !NO_UNION_TYPE]:
+        Don't make assumptions about the relative place of i and val.
+        (EQ) [!NO_UNION_TYPE]: Don't forget to check the type match as well.
+
+2004-04-21  Kim F. Storm  <storm@cua.dk>
+
+        * dispextern.h (struct glyph_slice): New struct.
+        (struct glyph): New member slice.
+        (GLYPH_SLICE_EQUAL_P): New macro.
+        (GLYPH_EQUAL_P): Use it.
+        (struct glyph_string): New member slice.
+        (struct it_slice): New struct.
+        (struct it): New member slice, add member to stack too.
+        New member constrain_row_ascent_descent_p.
+        (image_ascent): Add prototype.
+
+        * dispnew.c (buffer_posn_from_coords): Return full image width
+        and height even for image slices (posn is relative to full image).
+        (marginal_area_string): Adjust x0,y0 for image slice.
+
+        * image.c (image_ascent): Add slice arg; calculate ascent for
+        image slice (or full image).
+
+        * keyboard.c (Fposn_at_x_y, Fposn_at_point): New defuns.
+        (syms_of_keyboard): Defsubr them.
+
+        * lisp.h (pos_visible_p): Fix prototype.
+
+        * macterm.c (x_draw_relief_rect):  Add top_p and bot_p args.
+        (x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+        (x_draw_image_foreground, x_draw_image_relief)
+        (x_draw_image_foreground_1, x_draw_image_glyph_string):
+        Draw sliced images.
+
+        * w32term.c (w32_draw_relief_rect): Add top_p and bot_p args.
+        (x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+        (x_draw_image_foreground, x_draw_image_relief)
+        (w32_draw_image_foreground_1, x_draw_image_glyph_string):
+        Draw sliced images.
+
+        * w32term.h (image_ascent): Remove prototype.
+
+        * window.c (Fpos_visible_in_window_p): Return pixel position if
+        PARTIALLY arg is non-nil.  Simplify.  Doc fix.
+        (Fwindow_vscroll, Fset_window_vscroll): Add optional PIXEL_P arg
+        to return/set vscroll in pixels.
+
+        * window.h (Fwindow_vscroll, Fset_window_vscroll): Fix EXFUN.
+
+        * xdisp.c (Qslice): New variable.
+        (syms_of_xdisp): Intern and staticpro it.
+        (pos_visible_p): Return pixel position in new x and y args.
+        (init_iterator): Reset it->slice info.
+        (handle_display_prop): Parse (slice ...) property.
+        (push_it, pop_it): Save/restore slice info.
+        (make_cursor_line_fully_visible): Fix 2004-04-14 change.  Do not
+        force repositioning of tall row if window is vscrolled, as that
+        would reset vscroll.
+        (append_space): Set it->constrain_row_ascent_descent_p to avoid
+        increasing row height if row is non-empty.
+        (fill_image_glyph_string): Copy slice info.
+        (take_vertical_position_into_account): Simplify.
+        (produce_image_glyph): Handle iterator slice info, setup glyph
+        slice info.  Do not force minimum line height.
+        (x_produce_glyphs): If it->constrain_row_ascent_descent_p is set,
+        do not increase height (ascent/descent) of non-empty row when
+        adding normal character glyph; instead reduce glyph ascent/descent
+        appropriately; if row is higher than current glyph, adjust glyph
+        descent/ascent to reposition glyph within the existing row.
+        Likewise, when char is newline, only set ascent/descent if row is
+        currently empty.
+        (note_mouse_highlight): Handle hotspots with sliced image.
+
+        * xterm.c (x_draw_relief_rect): Add top_p and bot_p args.
+        (x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
+        (x_draw_image_foreground, x_draw_image_relief)
+        (x_draw_image_foreground_1, x_draw_image_glyph_string):
+        Draw sliced images.
+
+        * xterm.h (image_ascent): Remove prototype.
+
+2004-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fkey_description): Fix the usual int/Lisp_Object mixup.
+
+2004-04-20  John Paul Wallington  <jpw@gnu.org>
+
+        * fns.c (Fassoc, Feql): Fix indentation.
+
+        * fontset.c (regularize_fontname): Rename from regulalize_fontname.
+
+2004-04-19  John Paul Wallington  <jpw@gnu.org>
+
+        * fns.c (Feql): New function.
+        (syms_of_fns): Defsubr it.
+
 2004-04-18  Jason Rumney  <jasonr@gnu.org>
 
         * w32select.c (Fw32_set_clipboard_data): Get sequence number
@@ -8461,16 +8568,16 @@
 2002-07-11  Juanma Barranquero  <lektu@terra.es>
 
         * alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, coding.c,
-        * composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
-        * fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
-        * macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
-        * textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
-        * xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
+        composite.c, dired.c, dispnew.c, editfns.c, emacs.c, eval.c,
+        fileio.c, fns.c, insdel.c, keyboard.c, keymap.c, lread.c, macfns.c,
+        macmenu.c, macros.c, minibuf.c, print.c, process.c, sound.c,
+        textprop.c, w32fns.c, w32menu.c, window.c, xfaces.c, xfns.c,
+        xmenu.c, xselect.c, xterm.c: Use SPECPDL_INDEX wherever makes sense.
 
 2002-07-10  Juanma Barranquero  <lektu@terra.es>
 
-        * lisp.h (SPECPDL_INDEX): Rename from BINDING_STACK_SIZE. All callers
-        changed.
+        * lisp.h (SPECPDL_INDEX): Rename from BINDING_STACK_SIZE.
+        All callers changed.
 
 2002-07-09  Stefan Monnier  <monnier@cs.yale.edu>
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 3b71002a304..a3fc28e2491 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -274,6 +274,17 @@ enum glyph_type
 };
 
 
+/* Structure describing how to use partial glyphs (images slicing) */
+
+struct glyph_slice
+{
+  unsigned x : 16;
+  unsigned y : 16;
+  unsigned width : 16;
+  unsigned height : 16;
+};
+
+
 /* Glyphs.
 
    Be extra careful when changing this structure!  Esp. make sure that
@@ -352,6 +363,8 @@ struct glyph
      w32_char_font_type.  Otherwise it equals FONT_TYPE_UNKNOWN.  */
   unsigned font_type : 3;
 
+  struct glyph_slice slice;
+
   /* A union of sub-structures for different glyph types.  */
   union
   {
@@ -390,11 +403,20 @@ struct glyph
 #define CHAR_GLYPH_SPACE_P(GLYPH) \
      (GLYPH_FROM_CHAR_GLYPH ((GLYPH)) == SPACEGLYPH)
 
+/* Are glyph slices of glyphs *X and *Y equal */
+
+#define GLYPH_SLICE_EQUAL_P(X, Y)               \
+  ((X)->slice.x == (Y)->slice.x                 \
+   && (X)->slice.y == (Y)->slice.y              \
+   && (X)->slice.width == (Y)->slice.width      \
+   && (X)->slice.height == (Y)->slice.height)
+
 /* Are glyphs *X and *Y displayed equal?  */
 
 #define GLYPH_EQUAL_P(X, Y)                                     \
      ((X)->type == (Y)->type                                    \
       && (X)->u.val == (Y)->u.val                               \
+      && GLYPH_SLICE_EQUAL_P (X, Y)                             \
       && (X)->face_id == (Y)->face_id                           \
       && (X)->padding_p == (Y)->padding_p                       \
       && (X)->left_box_line_p == (Y)->left_box_line_p           \
@@ -1139,6 +1161,9 @@ struct glyph_string
   /* Image, if any.  */
   struct image *img;
 
+  /* Slice */
+  struct glyph_slice slice;
+
   struct glyph_string *next, *prev;
 };
 
@@ -1607,7 +1632,7 @@ extern int face_change_count;
    width and height of the bitmap, DH is the height adjustment (if
    bitmap is periodic).  X and Y are frame coordinates of the area to
    display the bitmap, DY is relative offset of the bitmap into that
-   area.  BX, NX, BY, NY specifies the area to clear if the bitmap 
+   area.  BX, NX, BY, NY specifies the area to clear if the bitmap
    does not fill the entire area.  FACE is the fringe face.  */
 
 struct draw_fringe_bitmap_params
@@ -1718,6 +1743,15 @@ enum prop_idx
 };
 
 
+struct it_slice
+{
+  Lisp_Object x;
+  Lisp_Object y;
+  Lisp_Object width;
+  Lisp_Object height;
+};
+
+
 struct it
 {
   /* The window in which we iterate over current_buffer (or a string).  */
@@ -1830,6 +1864,7 @@ struct it
     unsigned multibyte_p : 1;
     unsigned string_from_display_prop_p : 1;
     unsigned display_ellipsis_p : 1;
+    struct it_slice slice;
     Lisp_Object space_width;
     short voffset;
     Lisp_Object font_height;
@@ -1884,6 +1919,10 @@ struct it
      skipped due to selective display.  */
   unsigned face_before_selective_p : 1;
 
+  /* If 1, adjust current glyph so it does not increase current row
+     descent/ascent.  */
+  unsigned constrain_row_ascent_descent_p : 1;
+
   /* The ID of the default face to use.  One of DEFAULT_FACE_ID,
      MODE_LINE_FACE_ID, etc, depending on what we are displaying.  */
   int base_face_id;
@@ -1909,6 +1948,9 @@ struct it
   /* If what == IT_IMAGE, the id of the image to display.  */
   int image_id;
 
+  /* Values from `slice' property.  */
+  struct it_slice slice;
+
   /* Value of the `space-width' property, if any; nil if none.  */
   Lisp_Object space_width;
 
@@ -2176,7 +2218,7 @@ struct redisplay_interface
   int (*encode_char) P_ ((int c, XChar2b *char2b,
                           struct font_info *font_into, int *two_byte_p));
 
-/* Compute left and right overhang of glyph string S.  
+/* Compute left and right overhang of glyph string S.
    A NULL pointer if platform does not support this. */
   void (*compute_glyph_string_overhangs) P_ ((struct glyph_string *s));
 
@@ -2204,7 +2246,7 @@ struct redisplay_interface
   void (*draw_vertical_window_border) P_ ((struct window *w,
                                            int x, int y0, int y1));
 
-/* Shift display of frame F to make room for inserted glyphs. 
+/* Shift display of frame F to make room for inserted glyphs.
    The area at pixel (X,Y) of width WIDTH and height HEIGHT is
    shifted right by SHIFT_BY pixels.  */
   void (*shift_glyphs_for_insert) P_ ((struct frame *f,
@@ -2519,7 +2561,7 @@ extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
 extern int help_echo_showing_p;
 extern int current_mode_line_height, current_header_line_height;
 extern Lisp_Object help_echo_string, help_echo_window;
-extern Lisp_Object help_echo_object, previous_help_echo_string; 
+extern Lisp_Object help_echo_object, previous_help_echo_string;
 extern int help_echo_pos;
 extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
@@ -2629,6 +2671,8 @@ unsigned long image_background P_ ((struct image *, struct frame *,
 int image_background_transparent P_ ((struct image *, struct frame *,
                                       XImagePtr_or_DC mask));
 
+int image_ascent P_ ((struct image *, struct face *, struct glyph_slice *));
+
 #endif
 
 /* Defined in sysdep.c */
@@ -2733,7 +2777,7 @@ extern int required_matrix_height P_ ((struct window *));
 extern Lisp_Object buffer_posn_from_coords P_ ((struct window *,
                                                 int *, int *,
                                                 struct display_pos *,
-                                                Lisp_Object *, 
+                                                Lisp_Object *,
                                                 int *, int *, int *, int *));
 extern Lisp_Object mode_line_string P_ ((struct window *, enum window_part,
                                          int *, int *, int *,
diff --git a/src/dispnew.c b/src/dispnew.c
index f65a81fc5ef..fb78aa9c275 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5740,6 +5740,9 @@ buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height)
   struct text_pos startp;
   Lisp_Object string;
   struct glyph_row *row;
+#ifdef HAVE_WINDOW_SYSTEM
+  struct image *img = 0;
+#endif
   int x0, x1;
 
   current_buffer = XBUFFER (w->buffer);
@@ -5765,7 +5768,6 @@ buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height)
 #ifdef HAVE_WINDOW_SYSTEM
   if (it.what == IT_IMAGE)
     {
-      struct image *img;
       if ((img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL
           && !NILP (img->spec))
         *object = img->spec;
@@ -5778,12 +5780,22 @@ buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height)
       if (it.hpos < row->used[TEXT_AREA])
         {
           struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos;
-          *width = glyph->pixel_width;
-          *height = glyph->ascent + glyph->descent;
 #ifdef HAVE_WINDOW_SYSTEM
-          if (glyph->type == IMAGE_GLYPH)
-            *dy -= row->ascent - glyph->ascent;
+          if (img)
+            {
+              *dy -= row->ascent - glyph->ascent;
+              *dx += glyph->slice.x;
+              *dy += glyph->slice.y;
+              /* Image slices positions are still relative to the entire image */
+              *width = img->width;
+              *height = img->height;
+            }
+          else
 #endif
+            {
+              *width = glyph->pixel_width;
+              *height = glyph->ascent + glyph->descent;
+            }
         }
       else
         {
@@ -5949,6 +5961,8 @@ marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height)
               if (img != NULL)
                 *object = img->spec;
               y0 -= row->ascent - glyph->ascent;
+              x0 += glyph->slice.x;
+              y0 += glyph->slice.y;
             }
 #endif
         }
diff --git a/src/fns.c b/src/fns.c
index adb262ee11d..bb215317864 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1560,7 +1560,7 @@ assq_no_quit (key, list)
 DEFUN ("assoc", Fassoc, Sassoc, 2, 2, 0,
        doc: /* Return non-nil if KEY is `equal' to the car of an element of LIST.
 The value is actually the first element of LIST whose car equals KEY.  */)
-       (key, list)
+     (key, list)
      Lisp_Object key, list;
 {
   Lisp_Object result, car;
@@ -2135,6 +2135,18 @@ The PLIST is modified by side effects.  */)
   return plist;
 }
 
+DEFUN ("eql", Feql, Seql, 2, 2, 0,
+       doc: /* Return t if the two args are the same Lisp object.
+Floating-point numbers of equal value are `eql', but they may not be `eq'.  */)
+     (obj1, obj2)
+     Lisp_Object obj1, obj2;
+{
+  if (FLOATP (obj1))
+    return internal_equal (obj1, obj2, 0, 0) ? Qt : Qnil;
+  else
+    return EQ (obj1, obj2) ? Qt : Qnil;
+}
+
 DEFUN ("equal", Fequal, Sequal, 2, 2, 0,
        doc: /* Return t if two Lisp objects have similar structure and contents.
 They must have the same data type.
@@ -5740,6 +5752,7 @@ used if both `use-dialog-box' and this variable are non-nil.  */);
   defsubr (&Sput);
   defsubr (&Slax_plist_get);
   defsubr (&Slax_plist_put);
+  defsubr (&Seql);
   defsubr (&Sequal);
   defsubr (&Sequal_including_properties);
   defsubr (&Sfillarray);
diff --git a/src/fontset.c b/src/fontset.c
index ad9dd3ccd2f..aae6b9296ae 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -195,7 +195,7 @@ static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 static int fontset_id_valid_p P_ ((int));
 static Lisp_Object fontset_pattern_regexp P_ ((Lisp_Object));
 static Lisp_Object font_family_registry P_ ((Lisp_Object, int));
-static Lisp_Object regulalize_fontname P_ ((Lisp_Object));
+static Lisp_Object regularize_fontname P_ ((Lisp_Object));
 
 
 /********** MACROS AND FUNCTIONS TO HANDLE FONTSET **********/
@@ -1043,7 +1043,7 @@ check_fontset_name (name)
    string, maybe change FONTNAME to (FAMILY . REGISTRY).  */
 
 static Lisp_Object
-regulalize_fontname (Lisp_Object fontname)
+regularize_fontname (Lisp_Object fontname)
 {
   Lisp_Object family, registry;
 
@@ -1133,7 +1133,7 @@ name of a font, REGISTRY is a registry name of a font.  */)
   if (!NILP (frame))
     CHECK_LIVE_FRAME (frame);
 
-  elt = Fcons (make_number (from), regulalize_fontname (fontname));
+  elt = Fcons (make_number (from), regularize_fontname (fontname));
   for (; from <= to; from++)
     FONTSET_SET (fontset, from, elt);
   Foptimize_char_table (fontset);
@@ -1212,7 +1212,10 @@ If the named font is not yet loaded, return nil.  */)
 /* Return a cons (FONT-NAME . GLYPH-CODE).
    FONT-NAME is the font name for the character at POSITION in the current
    buffer.  This is computed from all the text properties and overlays
-   that apply to POSITION.
+   that apply to POSITION.  POSTION may be nil, in which case,
+   FONT-NAME is the font name for display the character CH with the
+   default face.
+
    GLYPH-CODE is the glyph code in the font to use for the character.
 
    If the 2nd optional arg CH is non-nil, it is a character to check
@@ -1225,7 +1228,8 @@ If the named font is not yet loaded, return nil.  */)
 
    (2) The character code is invalid.
 
-   (3) The current buffer is not displayed in any window.
+   (3) If POSITION is not nil, and the current buffer is not displayed
+   in any window.
 
    In addition, the returned font name may not take into account of
    such redisplay engine hooks as what used in jit-lock-mode if
@@ -1240,31 +1244,42 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
   int pos, pos_byte, dummy;
   int face_id;
   int c, code;
-  Lisp_Object window;
-  struct window *w;
   struct frame *f;
   struct face *face;
 
-  CHECK_NUMBER_COERCE_MARKER (position);
-  pos = XINT (position);
-  if (pos < BEGV || pos >= ZV)
-    args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
-  pos_byte = CHAR_TO_BYTE (pos);
-  if (NILP (ch))
-    c = FETCH_CHAR (pos_byte);
-  else
+  if (NILP (position))
     {
       CHECK_NATNUM (ch);
       c = XINT (ch);
+      f = XFRAME (selected_frame);
+      face_id = DEFAULT_FACE_ID;
+    }
+  else
+    {
+      Lisp_Object window;
+      struct window *w;
+
+      CHECK_NUMBER_COERCE_MARKER (position);
+      pos = XINT (position);
+      if (pos < BEGV || pos >= ZV)
+        args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
+      pos_byte = CHAR_TO_BYTE (pos);
+      if (NILP (ch))
+        c = FETCH_CHAR (pos_byte);
+      else
+        {
+          CHECK_NATNUM (ch);
+          c = XINT (ch);
+        }
+      window = Fget_buffer_window (Fcurrent_buffer (), Qnil);
+      if (NILP (window))
+        return Qnil;
+      w = XWINDOW (window);
+      f = XFRAME (w->frame);
+      face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
     }
   if (! CHAR_VALID_P (c, 0))
     return Qnil;
-  window = Fget_buffer_window (Fcurrent_buffer (), Qnil);
-  if (NILP (window))
-    return Qnil;
-  w = XWINDOW (window);
-  f = XFRAME (w->frame);
-  face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
   face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c);
   face = FACE_FROM_ID (f, face_id);
   if (! face->font || ! face->font_name)
@@ -1540,7 +1555,7 @@ It is intended that this function is called only from
 
       elt = XCAR (tail);
       target = Fcar (elt);
-      elt = Fcons (Qnil, regulalize_fontname (Fcdr (elt)));
+      elt = Fcons (Qnil, regularize_fontname (Fcdr (elt)));
       if (! CHAR_TABLE_P (target))
         {
           int charset, c;
diff --git a/src/image.c b/src/image.c
index 66b004220d1..4c2bdb440e8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1076,13 +1076,21 @@ prepare_image_for_display (f, img)
    drawn in face FACE.  */
 
 int
-image_ascent (img, face)
+image_ascent (img, face, slice)
      struct image *img;
      struct face *face;
+     struct glyph_slice *slice;
 {
-  int height = img->height + img->vmargin;
+  int height;
   int ascent;
 
+  if (slice->height == img->height)
+    height = img->height + img->vmargin;
+  else if (slice->y == 0)
+    height = slice->height + img->vmargin;
+  else
+    height = slice->height;
+
   if (img->ascent == CENTERED_IMAGE_ASCENT)
     {
       if (face->font)
diff --git a/src/keyboard.c b/src/keyboard.c
index 330eef60c1e..2a1c1c89e87 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10618,6 +10618,61 @@ 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,
+       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.
+
+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;
+{
+  if (NILP (frame_or_window))
+    frame_or_window = selected_window;
+
+  if (WINDOWP (frame_or_window))
+    {
+      struct window *w;
+
+      CHECK_LIVE_WINDOW (frame_or_window);
+
+      w = XWINDOW (frame_or_window);
+      XSETINT (x, (WINDOW_TO_FRAME_PIXEL_X (w, XINT (x))
+                   + window_box_left_offset (w, TEXT_AREA)));
+      XSETINT (y, WINDOW_TO_FRAME_PIXEL_Y (w, XINT (y)));
+      frame_or_window = w->frame;
+    }
+
+  CHECK_LIVE_FRAME (frame_or_window);
+
+  return make_lispy_position (XFRAME (frame_or_window), &x, &y, 0);
+}
+
+DEFUN ("posn-at-point", Fposn_at_point, Sposn_at_point, 0, 2, 0,
+       doc: /* Return position information for buffer POS in WINDOW.
+POS defaults to point in WINDOW; WINDOW defaults to the selected window.
+
+Return nil if position is not visible in window.  Otherwise,
+the return value is similar to that returned by event-start for
+a mouse click at the upper left corner of the glyph corresponding
+to the given buffer 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.  */*/)
+  (pos, window)
+     Lisp_Object pos, window;
+{
+  Lisp_Object tem;
+
+  tem = Fpos_visible_in_window_p (pos, window, Qt);
+  if (!NILP (tem))
+    tem = Fposn_at_x_y (XCAR (tem), XCAR (XCDR (tem)), window);
+  return tem;
+}
+
 
 /*
  * Set up a new kboard object with reasonable initial values.
@@ -11047,6 +11102,8 @@ syms_of_keyboard ()
   defsubr (&Sset_input_mode);
   defsubr (&Scurrent_input_mode);
   defsubr (&Sexecute_extended_command);
+  defsubr (&Sposn_at_point);
+  defsubr (&Sposn_at_x_y);
 
   DEFVAR_LISP ("last-command-char", &last_command_char,
                doc: /* Last input event that was part of a command.  */);
diff --git a/src/keymap.c b/src/keymap.c
index 0e68c38d677..a4aeea8ae63 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1959,14 +1959,14 @@ spaces are put between sequence elements, etc.  */)
   int len = 0;
   int i, i_byte;
   Lisp_Object *args;
-  int size = Flength (keys);
+  int size = XINT (Flength (keys));
   Lisp_Object list;
   Lisp_Object sep = build_string (" ");
   Lisp_Object key;
   int add_meta = 0;
 
   if (!NILP (prefix))
-    size += Flength (prefix);
+    size += XINT (Flength (prefix));
 
   /* This has one extra element at the end that we don't pass to Fconcat.  */
   args = (Lisp_Object *) alloca (size * 4 * sizeof (Lisp_Object));
@@ -1997,7 +1997,7 @@ spaces are put between sequence elements, etc.  */)
   else if (VECTORP (list))
     size = XVECTOR (list)->size;
   else if (CONSP (list))
-    size = Flength (list);
+    size = XINT (Flength (list));
   else
     wrong_type_argument (Qarrayp, list);
 
diff --git a/src/lisp.h b/src/lisp.h
index 48b9c0c7912..bc67f4dbe67 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -382,7 +382,7 @@ enum pvec_type
 
 #ifdef EXPLICIT_SIGN_EXTEND
 /* Make sure we sign-extend; compilers have been known to fail to do so.  */
-#define XINT(a) (((a).i << (BITS_PER_EMACS_INT - VALBITS)) \
+#define XINT(a) (((a).s.val << (BITS_PER_EMACS_INT - VALBITS)) \
                  >> (BITS_PER_EMACS_INT - VALBITS))
 #else
 #define XINT(a) ((a).s.val)
@@ -400,7 +400,7 @@ enum pvec_type
 extern Lisp_Object make_number ();
 #endif
 
-#define EQ(x, y) ((x).s.val == (y).s.val)
+#define EQ(x, y) ((x).s.val == (y).s.val && (x).s.type == (y).s.type)
 
 #endif /* NO_UNION_TYPE */
 
@@ -2391,7 +2391,8 @@ void set_frame_cursor_types P_ ((struct frame *, Lisp_Object));
 extern void syms_of_xdisp P_ ((void));
 extern void init_xdisp P_ ((void));
 extern Lisp_Object safe_eval P_ ((Lisp_Object));
-extern int pos_visible_p P_ ((struct window *, int, int *, int));
+extern int pos_visible_p P_ ((struct window *, int, int *,
+                              int *, int *, int));
 
 /* Defined in vm-limit.c.  */
 extern void memory_warnings P_ ((POINTER_TYPE *, void (*warnfun) ()));
diff --git a/src/macterm.c b/src/macterm.c
index 93f3e734724..88f5fce468c 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -294,7 +294,6 @@ void deactivate_scroll_bars (FRAME_PTR);
 
 static int is_emacs_window (WindowPtr);
 
-extern int image_ascent (struct image *, struct face *);
 int x_bitmap_icon (struct frame *, Lisp_Object);
 void x_make_frame_visible (struct frame *);
 
@@ -311,7 +310,7 @@ XFreePixmap (display, pixmap)
      Display *display;          /* not used */
      Pixmap pixmap;
 {
-  DisposeGWorld (pixmap); 
+  DisposeGWorld (pixmap);
 }
 
 
@@ -1283,7 +1282,7 @@ mac_draw_vertical_window_border (w, x, y0, y1)
      int x, y0, y1;
 {
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-  
+
   XDrawLine (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f),
              f->output_data.mac->normal_gc, x, y0, x, y1);
 }
@@ -1525,7 +1524,7 @@ x_draw_fringe_bitmap (w, row, p)
                         : face->foreground);
       gcv.background = face->background;
 
-      mac_draw_bitmap (display, window, &gcv, p->x, p->y, 
+      mac_draw_bitmap (display, window, &gcv, p->x, p->y,
                        p->wd, p->h, bits, p->overlay_p);
     }
 
@@ -1759,7 +1758,8 @@ static void x_draw_image_foreground_1 P_ ((struct glyph_string *, Pixmap));
 static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int,
                                            int, int, int));
 static void x_draw_relief_rect P_ ((struct frame *, int, int, int, int,
-                                    int, int, int, int, Rect *));
+                                    int, int, int, int, int, int,
+                                    Rect *));
 static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int,
                                  int, int, int, Rect *));
 
@@ -2483,9 +2483,10 @@ x_setup_relief_colors (s)
 
 static void
 x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
-                    raised_p, left_p, right_p, clip_rect)
+                    raised_p, top_p, bot_p, left_p, right_p, clip_rect)
      struct frame *f;
-     int left_x, top_y, right_x, bottom_y, width, left_p, right_p, raised_p;
+     int left_x, top_y, right_x, bottom_y, width;
+     int top_p, bot_p, left_p, right_p, raised_p;
      Rect *clip_rect;
 {
   Display *dpy = FRAME_MAC_DISPLAY (f);
@@ -2500,10 +2501,11 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
   mac_set_clip_rectangle (dpy, window, clip_rect);
 
   /* Top.  */
-  for (i = 0; i < width; ++i)
-    XDrawLine (dpy, window, gc,
-               left_x + i * left_p, top_y + i,
-               right_x - i * right_p, top_y + i);
+  if (top_p)
+    for (i = 0; i < width; ++i)
+      XDrawLine (dpy, window, gc,
+                 left_x + i * left_p, top_y + i,
+                 right_x - i * right_p, top_y + i);
 
   /* Left.  */
   if (left_p)
@@ -2520,10 +2522,11 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
                           clip_rect);
 
   /* Bottom.  */
-  for (i = 0; i < width; ++i)
-    XDrawLine (dpy, window, gc,
-               left_x + i * left_p, bottom_y - i,
-               right_x - i * right_p, bottom_y - i);
+  if (bot_p)
+    for (i = 0; i < width; ++i)
+      XDrawLine (dpy, window, gc,
+                 left_x + i * left_p, bottom_y - i,
+                 right_x - i * right_p, bottom_y - i);
 
   /* Right.  */
   if (right_p)
@@ -2629,7 +2632,7 @@ x_draw_glyph_string_box (s)
     {
       x_setup_relief_colors (s);
       x_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y,
-                          width, raised_p, left_p, right_p, &clip_rect);
+                          width, raised_p, 1, 1, left_p, right_p, &clip_rect);
     }
 }
 
@@ -2640,21 +2643,22 @@ static void
 x_draw_image_foreground (s)
      struct glyph_string *s;
 {
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->img->pixmap)
     {
@@ -2667,11 +2671,12 @@ x_draw_image_foreground (s)
           CONVERT_TO_XRECT (clip_rect, nr);
           image_rect.x = x;
           image_rect.y = y;
-          image_rect.width = s->img->width;
-          image_rect.height = s->img->height;
+          image_rect.width = s->slice.width;
+          image_rect.height = s->slice.height;
           if (x_intersect_rectangles (&clip_rect, &image_rect, &r))
             mac_copy_area_with_mask (s->display, s->img->pixmap, s->img->mask,
-                                     s->window, s->gc, r.x - x, r.y - y,
+                                     s->window, s->gc,
+                                     s->slice.x + r.x - x, s->slice.y + r.y - y,
                                      r.width, r.height, r.x, r.y);
         }
       else
@@ -2683,11 +2688,12 @@ x_draw_image_foreground (s)
           CONVERT_TO_XRECT (clip_rect, nr);
           image_rect.x = x;
           image_rect.y = y;
-          image_rect.width = s->img->width;
-          image_rect.height = s->img->height;
+          image_rect.width = s->slice.width;
+          image_rect.height = s->slice.height;
           if (x_intersect_rectangles (&clip_rect, &image_rect, &r))
             mac_copy_area (s->display, s->img->pixmap, s->window, s->gc,
-                           r.x - x, r.y - y, r.width, r.height, r.x, r.y);
+                           s->slice.x + r.x - x, s->slice.y + r.y - y,
+                           r.width, r.height, r.x, r.y);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2699,15 +2705,17 @@ x_draw_image_foreground (s)
             {
               int r = s->img->relief;
               if (r < 0) r = -r;
-              mac_draw_rectangle (s->display, s->window, s->gc, x - r, y - r,
-                                  s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+              mac_draw_rectangle (s->display, s->window, s->gc,
+                                  x - r, y - r,
+                                  s->slice.width + r*2 - 1,
+                                  s->slice.height + r*2 - 1);
             }
         }
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     mac_draw_rectangle (s->display, s->window, s->gc, x, y,
-                      s->img->width - 1, s->img->height - 1);
+                        s->slice.width - 1, s->slice.height - 1);
 }
 
 
@@ -2719,21 +2727,22 @@ x_draw_image_relief (s)
 {
   int x0, y0, x1, y1, thick, raised_p;
   Rect r;
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->hl == DRAW_IMAGE_SUNKEN
       || s->hl == DRAW_IMAGE_RAISED)
@@ -2749,12 +2758,17 @@ x_draw_image_relief (s)
 
   x0 = x - thick;
   y0 = y - thick;
-  x1 = x + s->img->width + thick - 1;
-  y1 = y + s->img->height + thick - 1;
+  x1 = x + s->slice.width + thick - 1;
+  y1 = y + s->slice.height + thick - 1;
 
   x_setup_relief_colors (s);
   get_glyph_string_clip_rect (s, &r);
-  x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r);
+  x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p,
+                      s->slice.y == 0,
+                      s->slice.y + s->slice.height == s->img->height,
+                      s->slice.x == 0,
+                      s->slice.x + s->slice.width == s->img->width,
+                      &r);
 }
 
 
@@ -2765,33 +2779,37 @@ x_draw_image_foreground_1 (s, pixmap)
      struct glyph_string *s;
      Pixmap pixmap;
 {
-  int x;
-  int y = s->ybase - s->y - image_ascent (s->img, s->face);
+  int x = 0;
+  int y = s->ybase - s->y - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = abs (s->face->box_line_width);
-  else
-    x = 0;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->img->pixmap)
     {
       if (s->img->mask)
         mac_copy_area_with_mask_to_pixmap (s->display, s->img->pixmap,
                                            s->img->mask, pixmap, s->gc,
-                                           0, 0, s->img->width, s->img->height,
+                                           s->slice.x, s->slice.y,
+                                           s->slice.width, s->slice.height,
                                            x, y);
       else
         {
           mac_copy_area_to_pixmap (s->display, s->img->pixmap, pixmap, s->gc,
-                               0, 0, s->img->width, s->img->height, x, y);
+                                   s->slice.x, s->slice.y,
+                                   s->slice.width, s->slice.height,
+                                   x, y);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2804,15 +2822,15 @@ x_draw_image_foreground_1 (s, pixmap)
               int r = s->img->relief;
               if (r < 0) r = -r;
               mac_draw_rectangle (s->display, s->window, s->gc, x - r, y - r,
-                                  s->img->width + r*2 - 1,
-                                  s->img->height + r*2 - 1);
+                                  s->slice.width + r*2 - 1,
+                                  s->slice.height + r*2 - 1);
             }
         }
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     mac_draw_rectangle_to_pixmap (s->display, pixmap, s->gc, x, y,
-                                  s->img->width - 1, s->img->height - 1);
+                                  s->slice.width - 1, s->slice.height - 1);
 }
 
 
@@ -2869,19 +2887,21 @@ x_draw_image_glyph_string (s)
      taller than image or if image has a clip mask to reduce
      flickering.  */
   s->stippled_p = s->face->stipple != 0;
-  if (height > s->img->height
+  if (height > s->slice.height
       || s->img->hmargin
       || s->img->vmargin
       || s->img->mask
       || s->img->pixmap == 0
       || s->width != s->background_width)
     {
-      if (box_line_hwidth && s->first_glyph->left_box_line_p)
-        x = s->x + box_line_hwidth;
-      else
-        x = s->x;
+      x = s->x;
+      if (s->first_glyph->left_box_line_p
+          && s->slice.x == 0)
+        x += box_line_hwidth;
 
-      y = s->y + box_line_vwidth;
+      y = s->y;
+      if (s->slice.y == 0)
+        y += box_line_vwidth;
 
       if (s->img->mask)
         {
@@ -3842,7 +3862,7 @@ glyph_rect (f, x, y, rect)
 
             /* x is to the right of the last glyph in the row.  */
             rect->left = WINDOW_TO_FRAME_PIXEL_X (w, gx);
-            /* Shouldn't this be a pixel value?  
+            /* Shouldn't this be a pixel value?
                WINDOW_RIGHT_EDGE_X (w) seems to be the right value.
                ++KFS */
             rect->right = WINDOW_RIGHT_EDGE_COL (w);
@@ -3984,7 +4004,7 @@ mac_handle_tool_bar_click (f, button_event)
   if (button_event->what == mouseDown)
     handle_tool_bar_click (f, x, y, 1, 0);
   else
-    handle_tool_bar_click (f, x, y, 0, 
+    handle_tool_bar_click (f, x, y, 0,
                            x_mac_to_emacs_modifiers (FRAME_MAC_DISPLAY_INFO (f),
                                                      button_event->modifiers));
 }
@@ -4933,7 +4953,7 @@ x_new_font (f, fontname)
   if (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0)
     {
       int wid = FRAME_COLUMN_WIDTH (f);
-      FRAME_CONFIG_SCROLL_BAR_COLS (f) 
+      FRAME_CONFIG_SCROLL_BAR_COLS (f)
         = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + wid-1) / wid;
     }
   else
@@ -5826,7 +5846,7 @@ decode_mac_font_name (char *name, int size, short scriptcode)
       break;
     case smKorean:
       coding_system = Qeuc_kr;
-      break;        
+      break;
     default:
       return;
     }
@@ -6277,7 +6297,7 @@ mac_do_list_fonts (pattern, maxnames)
           if (fast_string_match (pattern_regex, fontname) >= 0)
             {
               font_list = Fcons (fontname, font_list);
-              
+
               n_fonts++;
               if (maxnames > 0 && n_fonts >= maxnames)
                 break;
@@ -6987,7 +7007,7 @@ mac_get_emulated_btn ( UInt32 modifiers )
     if (modifiers & controlKey)
       result = cmdIs3 ? 2 : 1;
     else if (modifiers & optionKey)
-      result = cmdIs3 ? 1 : 2;      
+      result = cmdIs3 ? 1 : 2;
   }
   return result;
 }
@@ -7020,7 +7040,7 @@ mac_get_mouse_btn (EventRef ref)
   switch (result)
     {
     case kEventMouseButtonPrimary:
-      if (Vmac_emulate_three_button_mouse == Qnil) 
+      if (Vmac_emulate_three_button_mouse == Qnil)
         return 0;
       else {
         UInt32 mods = 0;
@@ -8189,7 +8209,7 @@ XTread_socket (int sd, int expected, struct input_event *hold_quit)
           switch (part_code)
             {
             case inMenuBar:
-              if (er.what == mouseDown)  
+              if (er.what == mouseDown)
                 {
                   struct frame *f = ((mac_output *)
                                      GetWRefCon (FrontWindow ()))->mFP;
@@ -8269,7 +8289,7 @@ XTread_socket (int sd, int expected, struct input_event *hold_quit)
                       else
                         mouse_tracking_in_progress = mouse_tracking_none;
                       window = window_from_coordinates (mwp->mFP, inev.x, inev.y, 0, 0, 0, 1);
-                      
+
                       if (EQ (window, mwp->mFP->tool_bar_window))
                         {
                           if (er.what == mouseDown)
@@ -8308,10 +8328,10 @@ XTread_socket (int sd, int expected, struct input_event *hold_quit)
 
             case inDrag:
 #if TARGET_API_MAC_CARBON
-              if (er.what == mouseDown)  
+              if (er.what == mouseDown)
                 {
                   BitMap bm;
-                  
+
                   GetQDGlobalsScreenBits (&bm);
                   DragWindow (window_ptr, er.where, &bm.bounds);
                 }
@@ -8331,7 +8351,7 @@ XTread_socket (int sd, int expected, struct input_event *hold_quit)
 
             /* window resize handling added --ben */
             case inGrow:
-              if (er.what == mouseDown)  
+              if (er.what == mouseDown)
                 {
                   do_grow_window(window_ptr, &er);
                   break;
@@ -9186,10 +9206,10 @@ Otherwise the option key is used.  */);
             useful for non-standard keyboard layouts.  */);
   Vmac_reverse_ctrl_meta = Qnil;
 
-  DEFVAR_LISP ("mac-emulate-three-button-mouse", 
+  DEFVAR_LISP ("mac-emulate-three-button-mouse",
                &Vmac_emulate_three_button_mouse,
     doc: /* t means that when the option-key is held down while pressing the
-    mouse button, the click will register as mouse-2 and while the 
+    mouse button, the click will register as mouse-2 and while the
     command-key is held down, the click will register as mouse-3.
     'reverse means that the the option-key will register for mouse-3
     and the command-key will register for mouse-2.  nil means that
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index c2a6e4a1eeb..7056d43af5f 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,4 +1,4 @@
-#  Makefile for GNU Emacs on the Microsoft W32 API.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (c) 2000-2001 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
diff --git a/src/w32term.c b/src/w32term.c
index 7f3b6b626de..24eabfba567 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1220,7 +1220,8 @@ static void w32_draw_image_foreground_1 P_ ((struct glyph_string *, HBITMAP));
 static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int,
                                            int, int, int));
 static void w32_draw_relief_rect P_ ((struct frame *, int, int, int, int,
-                                    int, int, int, int, RECT *));
+                                      int, int, int, int, int, int,
+                                      RECT *));
 static void w32_draw_box_rect P_ ((struct glyph_string *, int, int, int, int,
                                  int, int, int, RECT *));
 
@@ -1801,9 +1802,10 @@ x_setup_relief_colors (s)
 
 static void
 w32_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
-                      raised_p, left_p, right_p, clip_rect)
+                      raised_p, top_p, bot_p, left_p, right_p, clip_rect)
      struct frame *f;
-     int left_x, top_y, right_x, bottom_y, width, left_p, right_p, raised_p;
+     int left_x, top_y, right_x, bottom_y, width;
+     int top_p, bot_p, left_p, right_p, raised_p;
      RECT *clip_rect;
 {
   int i;
@@ -1818,10 +1820,11 @@ w32_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
   w32_set_clip_rectangle (hdc, clip_rect);
 
   /* Top.  */
-  for (i = 0; i < width; ++i)
-    w32_fill_area (f, hdc, gc.foreground,
-                   left_x + i * left_p, top_y + i,
-                   right_x - left_x - i * (left_p + right_p ) + 1, 1);
+  if (top_p)
+    for (i = 0; i < width; ++i)
+      w32_fill_area (f, hdc, gc.foreground,
+                     left_x + i * left_p, top_y + i,
+                     right_x - left_x - i * (left_p + right_p ) + 1, 1);
 
   /* Left.  */
   if (left_p)
@@ -1836,10 +1839,11 @@ w32_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
     gc.foreground = f->output_data.w32->white_relief.gc->foreground;
 
   /* Bottom.  */
-  for (i = 0; i < width; ++i)
-    w32_fill_area (f, hdc, gc.foreground,
-                   left_x + i * left_p, bottom_y - i,
-                   right_x - left_x - i * (left_p + right_p) + 1, 1);
+  if (bot_p)
+    for (i = 0; i < width; ++i)
+      w32_fill_area (f, hdc, gc.foreground,
+                     left_x + i * left_p, bottom_y - i,
+                     right_x - left_x - i * (left_p + right_p) + 1, 1);
 
   /* Right.  */
   if (right_p)
@@ -1949,7 +1953,7 @@ x_draw_glyph_string_box (s)
     {
       x_setup_relief_colors (s);
       w32_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y,
-                            width, raised_p, left_p, right_p, &clip_rect);
+                            width, raised_p, 1, 1, left_p, right_p, &clip_rect);
     }
 }
 
@@ -1960,21 +1964,22 @@ static void
 x_draw_image_foreground (s)
      struct glyph_string *s;
 {
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   SaveDC (s->hdc);
 
@@ -1996,12 +2001,12 @@ x_draw_image_foreground (s)
           SetTextColor (s->hdc, RGB (255, 255, 255));
           SetBkColor (s->hdc, RGB (0, 0, 0));
 
-          BitBlt (s->hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCINVERT);
-          BitBlt (s->hdc, x, y, s->img->width, s->img->height,
-                  mask_dc, 0, 0, SRCAND);
-          BitBlt (s->hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCINVERT);
+          BitBlt (s->hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCINVERT);
+          BitBlt (s->hdc, x, y, s->slice.width, s->slice.height,
+                  mask_dc, s->slice.x, s->slice.y, SRCAND);
+          BitBlt (s->hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCINVERT);
 
           SelectObject (mask_dc, mask_orig_obj);
           DeleteDC (mask_dc);
@@ -2011,8 +2016,8 @@ x_draw_image_foreground (s)
           SetTextColor (s->hdc, s->gc->foreground);
           SetBkColor (s->hdc, s->gc->background);
 
-          BitBlt (s->hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCCOPY);
+          BitBlt (s->hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCCOPY);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2025,7 +2030,8 @@ x_draw_image_foreground (s)
               int r = s->img->relief;
               if (r < 0) r = -r;
               w32_draw_rectangle (s->hdc, s->gc, x - r, y - r ,
-                                  s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+                                  s->slice.width + r*2 - 1,
+                                  s->slice.height + r*2 - 1);
             }
         }
 
@@ -2036,8 +2042,8 @@ x_draw_image_foreground (s)
       DeleteDC (compat_hdc);
     }
   else
-    w32_draw_rectangle (s->hdc, s->gc, x, y, s->img->width -1,
-                        s->img->height - 1);
+    w32_draw_rectangle (s->hdc, s->gc, x, y,
+                        s->slice.width - 1, s->slice.height - 1);
 
   RestoreDC (s->hdc ,-1);
 }
@@ -2052,21 +2058,22 @@ x_draw_image_relief (s)
 {
   int x0, y0, x1, y1, thick, raised_p;
   RECT r;
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->hl == DRAW_IMAGE_SUNKEN
       || s->hl == DRAW_IMAGE_RAISED)
@@ -2082,12 +2089,17 @@ x_draw_image_relief (s)
 
   x0 = x - thick;
   y0 = y - thick;
-  x1 = x + s->img->width + thick - 1;
-  y1 = y + s->img->height + thick - 1;
+  x1 = x + s->slice.width + thick - 1;
+  y1 = y + s->slice.height + thick - 1;
 
   x_setup_relief_colors (s);
   get_glyph_string_clip_rect (s, &r);
-  w32_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r);
+  w32_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p,
+                        s->slice.y == 0,
+                        s->slice.y + s->slice.height == s->img->height,
+                        s->slice.x == 0,
+                        s->slice.x + s->slice.width == s->img->width,
+                        &r);
 }
 
 
@@ -2100,21 +2112,22 @@ w32_draw_image_foreground_1 (s, pixmap)
 {
   HDC hdc = CreateCompatibleDC (s->hdc);
   HGDIOBJ orig_hdc_obj = SelectObject (hdc, pixmap);
-  int x;
-  int y = s->ybase - s->y - image_ascent (s->img, s->face);
+  int x = 0;
+  int y = s->ybase - s->y - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = abs (s->face->box_line_width);
-  else
-    x = 0;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->img->pixmap)
     {
@@ -2130,12 +2143,12 @@ w32_draw_image_foreground_1 (s, pixmap)
 
           SetTextColor (hdc, RGB (0, 0, 0));
           SetBkColor (hdc, RGB (255, 255, 255));
-          BitBlt (hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCINVERT);
-          BitBlt (hdc, x, y, s->img->width, s->img->height,
-                  mask_dc, 0, 0, SRCAND);
-          BitBlt (hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCINVERT);
+          BitBlt (hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCINVERT);
+          BitBlt (hdc, x, y, s->slice.width, s->slice.height,
+                  mask_dc, s->slice.x, s->slice.y, SRCAND);
+          BitBlt (hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCINVERT);
 
           SelectObject (mask_dc, mask_orig_obj);
           DeleteDC (mask_dc);
@@ -2145,8 +2158,8 @@ w32_draw_image_foreground_1 (s, pixmap)
           SetTextColor (hdc, s->gc->foreground);
           SetBkColor (hdc, s->gc->background);
 
-          BitBlt (hdc, x, y, s->img->width, s->img->height,
-                  compat_hdc, 0, 0, SRCCOPY);
+          BitBlt (hdc, x, y, s->slice.width, s->slice.height,
+                  compat_hdc, s->slice.x, s->slice.y, SRCCOPY);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2158,8 +2171,9 @@ w32_draw_image_foreground_1 (s, pixmap)
             {
               int r = s->img->relief;
               if (r < 0) r = -r;
-              w32_draw_rectangle (hdc, s->gc, x - r, y - r ,
-                                  s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+              w32_draw_rectangle (hdc, s->gc, x - r, y - r,
+                                  s->slice.width + r*2 - 1,
+                                  s->slice.height + r*2 - 1);
             }
         }
 
@@ -2169,8 +2183,8 @@ w32_draw_image_foreground_1 (s, pixmap)
       DeleteDC (compat_hdc);
     }
   else
-    w32_draw_rectangle (hdc, s->gc, x, y, s->img->width - 1,
-                        s->img->height - 1);
+    w32_draw_rectangle (hdc, s->gc, x, y,
+                        s->slice.width - 1, s->slice.height - 1);
 
   SelectObject (hdc, orig_hdc_obj);
   DeleteDC (hdc);
@@ -2229,19 +2243,22 @@ x_draw_image_glyph_string (s)
      taller than image or if image has a clip mask to reduce
      flickering.  */
   s->stippled_p = s->face->stipple != 0;
-  if (height > s->img->height
+  if (height > s->slice.height
       || s->img->hmargin
       || s->img->vmargin
       || s->img->mask
       || s->img->pixmap == 0
       || s->width != s->background_width)
     {
-      if (box_line_hwidth && s->first_glyph->left_box_line_p)
-        x = s->x + box_line_hwidth;
-      else
-        x = s->x;
+      x = s->x;
+      if (s->first_glyph->left_box_line_p
+          && s->slice.x == 0)
+        x += box_line_hwidth;
+
+      y = s->y;
+      if (s->slice.y == 0)
+        y += box_line_vwidth;
 
-      y = s->y + box_line_vwidth;
 #if 0 /* TODO: figure out if we need to do this on Windows.  */
       if (s->img->mask)
         {
diff --git a/src/w32term.h b/src/w32term.h
index 68967ad7d24..f7c4c30064e 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -719,7 +719,6 @@ XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
 struct frame * check_x_frame (Lisp_Object);
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
-int image_ascent P_ ((struct image *, struct face *));
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch)                 \
   ((font)->bdf ? BDF_1D_FONT : ANSI_FONT)
diff --git a/src/window.c b/src/window.c
index b6546eee698..221d8bbbaf2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -324,7 +324,11 @@ DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p,
 Return nil if that position is scrolled vertically out of view.
 If a character is only partially visible, nil is returned, unless the
 optional argument PARTIALLY is non-nil.
-POS defaults to point in WINDOW; WINDOW defaults to the selected window.  */)
+POS defaults to point in WINDOW; WINDOW defaults to the selected window.
+
+If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
+return value is a list (X Y PARTIAL) where X and Y are the pixel relative
+coordinate  */)
      (pos, window, partially)
      Lisp_Object pos, window, partially;
 {
@@ -332,8 +336,9 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window.  */)
   register int posint;
   register struct buffer *buf;
   struct text_pos top;
-  Lisp_Object in_window;
-  int fully_p;
+  Lisp_Object in_window = Qnil;
+  int fully_p = 1;
+  int x, y;
 
   w = decode_window (window);
   buf = XBUFFER (w->buffer);
@@ -349,38 +354,20 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window.  */)
   else
     posint = XMARKER (w->pointm)->charpos;
 
-  /* If position is above window start, it's not visible.  */
-  if (posint < CHARPOS (top))
-    in_window = Qnil;
-  else if (XFASTINT (w->last_modified) >= BUF_MODIFF (buf)
-           && XFASTINT (w->last_overlay_modified) >= BUF_OVERLAY_MODIFF (buf)
-           && posint < BUF_Z (buf) - XFASTINT (w->window_end_pos))
-    {
-      /* If frame is up-to-date, and POSINT is < window end pos, use
-         that info.  This doesn't work for POSINT == end pos, because
-         the window end pos is actually the position _after_ the last
-         char in the window.  */
-      if (NILP (partially))
-        {
-          pos_visible_p (w, posint, &fully_p, NILP (partially));
-          in_window = fully_p ? Qt : Qnil;
-        }
-      else
-        in_window = Qt;
-    }
-  else if (posint > BUF_ZV (buf))
-    in_window = Qnil;
-  else if (CHARPOS (top) < BUF_BEGV (buf) || CHARPOS (top) > BUF_ZV (buf))
-    /* If window start is out of range, do something reasonable.  */
-    in_window = Qnil;
-  else
-    {
-      if (pos_visible_p (w, posint, &fully_p, NILP (partially)))
-        in_window = !NILP (partially) || fully_p ? Qt : Qnil;
-      else
-        in_window = Qnil;
-    }
-
+  /* If position is above window start or outside buffer boundaries,
+     or if window start is out of range, position is not visible.  */
+  if (posint >= CHARPOS (top)
+      && posint <= BUF_ZV (buf)
+      && CHARPOS (top) >= BUF_BEGV (buf)
+      && CHARPOS (top) <= BUF_ZV (buf)
+      && pos_visible_p (w, posint, &fully_p, &x, &y, NILP (partially))
+      && (!NILP (partially) || fully_p))
+    in_window = Qt;
+
+  if (!NILP (in_window) && !NILP (partially))
+    in_window = Fcons (make_number (x),
+                       Fcons (make_number (y),
+                              Fcons (fully_p ? Qt : Qnil, Qnil)));
   return in_window;
 }
 
@@ -3462,7 +3449,7 @@ DEFUN ("force-window-update", Fforce_window_update, Sforce_window_update,
        0, 1, 0,
        doc: /* Force redisplay of all windows.
 If optional arg OBJECT is a window, force redisplay of that window only.
-If OBJECT is a buffer or buffer name, force redisplay of all windows 
+If OBJECT is a buffer or buffer name, force redisplay of all windows
 displaying that buffer.  */)
      (object)
      Lisp_Object object;
@@ -3484,7 +3471,7 @@ displaying that buffer.  */)
       ++update_mode_lines;
       return Qt;
     }
-    
+
   if (STRINGP (object))
     object = Fget_buffer (object);
   if (BUFFERP (object) && !NILP (XBUFFER (object)->name))
@@ -3549,7 +3536,7 @@ temp_output_buffer_show (buf)
           Lisp_Object prev_window, prev_buffer;
           prev_window = selected_window;
           XSETBUFFER (prev_buffer, old);
-          
+
           /* Select the window that was chosen, for running the hook.
              Note: Both Fselect_window and select_window_norecord may
              set-buffer to the buffer displayed in the window,
@@ -6069,7 +6056,7 @@ If TYPE is t, use the frame's scroll-bar type.  */)
     vertical_type = Qnil;
 
   if (!(EQ (vertical_type, Qnil)
-        || EQ (vertical_type, Qleft) 
+        || EQ (vertical_type, Qleft)
         || EQ (vertical_type, Qright)
         || EQ (vertical_type, Qt)))
     error ("Invalid type of vertical scroll bar");
@@ -6118,12 +6105,13 @@ value.  */)
                            Smooth scrolling
  ***********************************************************************/
 
-DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 0, 1, 0,
+DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 0, 2, 0,
        doc: /* Return the amount by which WINDOW is scrolled vertically.
 Use the selected window if WINDOW is nil or omitted.
-Value is a multiple of the canonical character height of WINDOW.  */)
-     (window)
-     Lisp_Object window;
+Normally, value is a multiple of the canonical character height of WINDOW;
+optional second arg PIXELS_P means value is measured in pixels.  */)
+  (window, pixels_p)
+     Lisp_Object window, pixels_p;
 {
   Lisp_Object result;
   struct frame *f;
@@ -6137,7 +6125,9 @@ Value is a multiple of the canonical character height of WINDOW.  */)
   f = XFRAME (w->frame);
 
   if (FRAME_WINDOW_P (f))
-    result = FRAME_CANON_Y_FROM_PIXEL_Y (f, -w->vscroll);
+    result = (NILP (pixels_p)
+              ? FRAME_CANON_Y_FROM_PIXEL_Y (f, -w->vscroll)
+              : make_number (-w->vscroll));
   else
     result = make_number (0);
   return result;
@@ -6145,12 +6135,13 @@ Value is a multiple of the canonical character height of WINDOW.  */)
 
 
 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll,
-       2, 2, 0,
+       2, 3, 0,
        doc: /* Set amount by which WINDOW should be scrolled vertically to VSCROLL.
-WINDOW nil means use the selected window.  VSCROLL is a non-negative
-multiple of the canonical character height of WINDOW.  */)
-     (window, vscroll)
-     Lisp_Object window, vscroll;
+WINDOW nil means use the selected window.  Normally, VSCROLL is a
+non-negative multiple of the canonical character height of WINDOW;
+optional third arg PIXELS_P non-nil means that VSCROLL is in pixels.  */)
+  (window, vscroll, pixels_p)
+     Lisp_Object window, vscroll, pixels_p;
 {
   struct window *w;
   struct frame *f;
@@ -6168,7 +6159,9 @@ multiple of the canonical character height of WINDOW.  */)
     {
       int old_dy = w->vscroll;
 
-      w->vscroll = - FRAME_LINE_HEIGHT (f) * XFLOATINT (vscroll);
+      w->vscroll = - (NILP (pixels_p)
+                      ? FRAME_LINE_HEIGHT (f) * XFLOATINT (vscroll)
+                      : XFLOATINT (vscroll));
       w->vscroll = min (w->vscroll, 0);
 
       /* Adjust glyph matrix of the frame if the virtual display
@@ -6180,7 +6173,7 @@ multiple of the canonical character height of WINDOW.  */)
       XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
     }
 
-  return Fwindow_vscroll (window);
+  return Fwindow_vscroll (window, pixels_p);
 }
 
 
diff --git a/src/window.h b/src/window.h
index ef81da43b4d..59052af96a5 100644
--- a/src/window.h
+++ b/src/window.h
@@ -320,7 +320,7 @@ struct window
     |  |   +--------------------------- LEFT_MARGIN_COLS
     |  +------------------------------- LEFT_FRINGE_WIDTH
     +---------------------------------- LEFT_SCROLL_BAR_COLS
-    
+
 */
 
 
@@ -767,8 +767,8 @@ EXFUN (Fdisplay_buffer, 3);
 EXFUN (Fset_window_buffer, 3);
 EXFUN (Fset_window_hscroll, 2);
 EXFUN (Fwindow_hscroll, 1);
-EXFUN (Fset_window_vscroll, 2);
-EXFUN (Fwindow_vscroll, 1);
+EXFUN (Fset_window_vscroll, 3);
+EXFUN (Fwindow_vscroll, 2);
 EXFUN (Fset_window_margins, 3);
 EXFUN (Fwindow_live_p, 1);
 EXFUN (Fset_window_point, 2);
diff --git a/src/xdisp.c b/src/xdisp.c
index 3c144f4f5f4..fd621fe301b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -301,6 +301,7 @@ extern Lisp_Object Qface, Qinvisible, Qwidth;
 Lisp_Object Vdisplay_pixels_per_inch;
 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
+Lisp_Object Qslice;
 Lisp_Object Qcenter;
 Lisp_Object Qmargin, Qpointer;
 extern Lisp_Object Qheight;
@@ -1231,9 +1232,9 @@ line_bottom_y (it)
    and header-lines heights.  */
 
 int
-pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
+pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
      struct window *w;
-     int charpos, *fully, exact_mode_line_heights_p;
+     int charpos, *fully, *x, *y, exact_mode_line_heights_p;
 {
   struct it it;
   struct text_pos top;
@@ -1281,14 +1282,27 @@ pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
           visible_p = 1;
           *fully = bottom_y <= it.last_visible_y;
         }
+      if (visible_p && x)
+        {
+          *x = it.current_x;
+          *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
+        }
     }
   else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
     {
+      struct it it2;
+
+      it2 = it;
       move_it_by_lines (&it, 1, 0);
       if (charpos < IT_CHARPOS (it))
         {
           visible_p = 1;
-          *fully  = 0;
+          if (x)
+            {
+              move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
+              *x = it2.current_x;
+              *y = it2.current_y + it2.max_ascent - it2.ascent;
+            }
         }
     }
 
@@ -1296,6 +1310,7 @@ pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
     set_buffer_internal_1 (old_buffer);
 
   current_header_line_height = current_mode_line_height = -1;
+
   return visible_p;
 }
 
@@ -2063,7 +2078,8 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
   if (FRAME_FACE_CACHE (it->f)->used == 0)
     recompute_basic_faces (it->f);
 
-  /* Current value of the `space-width', and 'height' properties.  */
+  /* Current value of the `slice', `space-width', and 'height' properties.  */
+  it->slice.x = it->slice.y = it->slice.width = it->slice.height = Qnil;
   it->space_width = Qnil;
   it->font_height = Qnil;
 
@@ -3271,8 +3287,9 @@ handle_display_prop (it)
     }
 
   /* Reset those iterator values set from display property values.  */
-  it->font_height = Qnil;
+  it->slice.x = it->slice.y = it->slice.width = it->slice.height = Qnil;
   it->space_width = Qnil;
+  it->font_height = Qnil;
   it->voffset = 0;
 
   /* We don't support recursive `display' properties, i.e. string
@@ -3291,6 +3308,7 @@ handle_display_prop (it)
       && !EQ (XCAR (prop), Qimage)
       && !EQ (XCAR (prop), Qspace)
       && !EQ (XCAR (prop), Qwhen)
+      && !EQ (XCAR (prop), Qslice)
       && !EQ (XCAR (prop), Qspace_width)
       && !EQ (XCAR (prop), Qheight)
       && !EQ (XCAR (prop), Qraise)
@@ -3487,6 +3505,30 @@ handle_single_display_prop (it, prop, object, position,
         it->space_width = value;
     }
   else if (CONSP (prop)
+           && EQ (XCAR (prop), Qslice))
+    {
+      /* `(slice X Y WIDTH HEIGHT)'.  */
+      Lisp_Object tem;
+
+      if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
+        return 0;
+
+      if (tem = XCDR (prop), CONSP (tem))
+        {
+          it->slice.x = XCAR (tem);
+          if (tem = XCDR (tem), CONSP (tem))
+            {
+              it->slice.y = XCAR (tem);
+              if (tem = XCDR (tem), CONSP (tem))
+                {
+                  it->slice.width = XCAR (tem);
+                  if (tem = XCDR (tem), CONSP (tem))
+                    it->slice.height = XCAR (tem);
+                }
+            }
+        }
+    }
+  else if (CONSP (prop)
            && EQ (XCAR (prop), Qraise)
            && CONSP (XCDR (prop)))
     {
@@ -4327,6 +4369,7 @@ push_it (it)
   p->string_nchars = it->string_nchars;
   p->area = it->area;
   p->multibyte_p = it->multibyte_p;
+  p->slice = it->slice;
   p->space_width = it->space_width;
   p->font_height = it->font_height;
   p->voffset = it->voffset;
@@ -4359,6 +4402,7 @@ pop_it (it)
   it->string_nchars = p->string_nchars;
   it->area = p->area;
   it->multibyte_p = p->multibyte_p;
+  it->slice = p->slice;
   it->space_width = p->space_width;
   it->font_height = p->font_height;
   it->voffset = p->voffset;
@@ -10758,15 +10802,14 @@ make_cursor_line_fully_visible (w, force_p)
   if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
     return 1;
 
-  if (force_p)
-    return 0;
-
   /* If the row the cursor is in is taller than the window's height,
      it's not clear what to do, so do nothing.  */
   window_height = window_box_height (w);
   if (row->height >= window_height)
-    return 1;
-
+    {
+      if (!force_p || w->vscroll)
+        return 1;
+    }
   return 0;
 
 #if 0
@@ -14153,8 +14196,12 @@ append_space (it, default_face_p)
           face = FACE_FROM_ID (it->f, it->face_id);
           it->face_id = FACE_FOR_CHAR (it->f, face, 0);
 
+          if (it->max_ascent > 0 || it->max_descent > 0)
+            it->constrain_row_ascent_descent_p = 1;
+
           PRODUCE_GLYPHS (it);
 
+          it->constrain_row_ascent_descent_p = 0;
           it->current_x = saved_x;
           it->object = saved_object;
           it->position = saved_pos;
@@ -17301,6 +17348,7 @@ fill_image_glyph_string (s)
   xassert (s->first_glyph->type == IMAGE_GLYPH);
   s->img = IMAGE_FROM_ID (s->f, s->first_glyph->u.img_id);
   xassert (s->img);
+  s->slice = s->first_glyph->slice;
   s->face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
   s->font = s->face->font;
   s->width = s->first_glyph->pixel_width;
@@ -18099,7 +18147,7 @@ take_vertical_position_into_account (it)
       if (it->voffset < 0)
         /* Increase the ascent so that we can display the text higher
            in the line.  */
-        it->ascent += abs (it->voffset);
+        it->ascent -= it->voffset;
       else
         /* Increase the descent so that we can display the text lower
            in the line.  */
@@ -18119,6 +18167,7 @@ produce_image_glyph (it)
   struct image *img;
   struct face *face;
   int face_ascent, glyph_ascent;
+  struct glyph_slice slice;
 
   xassert (it->what == IT_IMAGE);
 
@@ -18142,19 +18191,68 @@ produce_image_glyph (it)
   /* Make sure X resources of the image is loaded.  */
   prepare_image_for_display (it->f, img);
 
-  it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face);
-  it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent;
-  it->pixel_width = img->width + 2 * img->hmargin;
+  slice.x = slice.y = 0;
+  slice.width = img->width;
+  slice.height = img->height;
+
+  if (INTEGERP (it->slice.x))
+    slice.x = XINT (it->slice.x);
+  else if (FLOATP (it->slice.x))
+    slice.x = XFLOAT_DATA (it->slice.x) * img->width;
+
+  if (INTEGERP (it->slice.y))
+    slice.y = XINT (it->slice.y);
+  else if (FLOATP (it->slice.y))
+    slice.y = XFLOAT_DATA (it->slice.y) * img->height;
+
+  if (INTEGERP (it->slice.width))
+    slice.width = XINT (it->slice.width);
+  else if (FLOATP (it->slice.width))
+    slice.width = XFLOAT_DATA (it->slice.width) * img->width;
+
+  if (INTEGERP (it->slice.height))
+    slice.height = XINT (it->slice.height);
+  else if (FLOATP (it->slice.height))
+    slice.height = XFLOAT_DATA (it->slice.height) * img->height;
+
+  if (slice.x >= img->width)
+    slice.x = img->width;
+  if (slice.y >= img->height)
+    slice.y = img->height;
+  if (slice.x + slice.width >= img->width)
+    slice.width = img->width - slice.x;
+  if (slice.y + slice.height > img->height)
+    slice.height = img->height - slice.y;
+
+  if (slice.width == 0 || slice.height == 0)
+    return;
+
+  it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face, &slice);
+
+  it->descent = slice.height - glyph_ascent;
+  if (slice.y == 0)
+    it->descent += img->vmargin;
+  if (slice.y + slice.height == img->height)
+    it->descent += img->vmargin;
+  it->phys_descent = it->descent;
+
+  it->pixel_width = slice.width;
+  if (slice.x == 0)
+    it->pixel_width += img->hmargin;
+  if (slice.x + slice.width == img->width)
+    it->pixel_width += img->hmargin;
 
   /* It's quite possible for images to have an ascent greater than
      their height, so don't get confused in that case.  */
   if (it->descent < 0)
     it->descent = 0;
 
+#if 0  /* this breaks image tiling */
   /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent.  */
   face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
   if (face_ascent > it->ascent)
     it->ascent = it->phys_ascent = face_ascent;
+#endif
 
   it->nglyphs = 1;
 
@@ -18162,13 +18260,15 @@ produce_image_glyph (it)
     {
       if (face->box_line_width > 0)
         {
-          it->ascent += face->box_line_width;
-          it->descent += face->box_line_width;
+          if (slice.y == 0)
+            it->ascent += face->box_line_width;
+          if (slice.y + slice.height == img->height)
+            it->descent += face->box_line_width;
         }
 
-      if (it->start_of_box_run_p)
+      if (it->start_of_box_run_p && slice.x == 0)
         it->pixel_width += abs (face->box_line_width);
-      if (it->end_of_box_run_p)
+      if (it->end_of_box_run_p && slice.x + slice.width == img->width)
         it->pixel_width += abs (face->box_line_width);
     }
 
@@ -18197,6 +18297,7 @@ produce_image_glyph (it)
           glyph->glyph_not_available_p = 0;
           glyph->face_id = it->face_id;
           glyph->u.img_id = img->id;
+          glyph->slice = slice;
           glyph->font_type = FONT_TYPE_UNKNOWN;
           ++it->glyph_row->used[area];
         }
@@ -18488,8 +18589,9 @@ x_produce_glyphs (it)
 
           it->nglyphs = 1;
 
-          pcm = FRAME_RIF (it->f)->per_char_metric (font, &char2b,
-                                                    FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
+          pcm = FRAME_RIF (it->f)->per_char_metric
+            (font, &char2b, FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
+
           it->ascent = FONT_BASE (font) + boff;
           it->descent = FONT_DESCENT (font) - boff;
 
@@ -18502,11 +18604,27 @@ x_produce_glyphs (it)
           else
             {
               it->glyph_not_available_p = 1;
-              it->phys_ascent = FONT_BASE (font) + boff;
-              it->phys_descent = FONT_DESCENT (font) - boff;
+              it->phys_ascent = it->ascent;
+              it->phys_descent = it->descent;
               it->pixel_width = FONT_WIDTH (font);
             }
 
+          if (it->constrain_row_ascent_descent_p)
+            {
+              if (it->descent > it->max_descent)
+                {
+                  it->ascent += it->descent - it->max_descent;
+                  it->descent = it->max_descent;
+                }
+              if (it->ascent> it->max_ascent)
+                {
+                  it->descent = min (it->max_descent, it->descent + it->ascent - it->max_ascent);
+                  it->ascent = it->max_ascent;
+                }
+              it->phys_ascent = min (it->phys_ascent, it->ascent);
+              it->phys_descent = min (it->phys_descent, it->descent);
+            }
+
           /* If this is a space inside a region of text with
              `space-width' property, change its width.  */
           stretched_p = it->char_to_display == ' ' && !NILP (it->space_width);
@@ -18539,6 +18657,14 @@ x_produce_glyphs (it)
           if (face->overline_p)
             it->ascent += 2;
 
+          if (it->constrain_row_ascent_descent_p)
+            {
+              if (it->ascent > it->max_ascent)
+                it->ascent = it->max_ascent;
+              if (it->descent > it->max_descent)
+                it->descent = it->max_descent;
+            }
+
           take_vertical_position_into_account (it);
 
           /* If we have to actually produce glyphs, do it.  */
@@ -18565,13 +18691,31 @@ x_produce_glyphs (it)
         }
       else if (it->char_to_display == '\n')
         {
-          /* A newline has no width but we need the height of the line.  */
+          /* A newline has no width but we need the height of the line.
+             But if previous part of the line set a height, don't
+             increase that height */
+
           it->pixel_width = 0;
           it->nglyphs = 0;
-          it->ascent = it->phys_ascent = FONT_BASE (font) + boff;
-          it->descent = it->phys_descent = FONT_DESCENT (font) - boff;
 
-          if (face->box != FACE_NO_BOX
+          it->ascent = FONT_BASE (font) + boff;
+          it->descent = FONT_DESCENT (font) - boff;
+
+          if (it->max_ascent > 0 || it->max_descent > 0)
+            {
+              it->ascent = it->descent = 0;
+            }
+          else
+            {
+              it->ascent = FONT_BASE (font) + boff;
+              it->descent = FONT_DESCENT (font) - boff;
+            }
+
+          it->phys_ascent = it->ascent;
+          it->phys_descent = it->descent;
+
+          if ((it->max_ascent > 0 || it->max_descent > 0)
+              && face->box != FACE_NO_BOX
               && face->box_line_width > 0)
             {
               it->ascent += face->box_line_width;
@@ -20544,7 +20688,9 @@ note_mouse_highlight (f, x, y)
               Lisp_Object image_map, hotspot;
               if ((image_map = Fplist_get (XCDR (img->spec), QCmap),
                    !NILP (image_map))
-                  && (hotspot = find_hot_spot (image_map, dx, dy),
+                  && (hotspot = find_hot_spot (image_map,
+                                               glyph->slice.x + dx,
+                                               glyph->slice.y + dy),
                       CONSP (hotspot))
                   && (hotspot = XCDR (hotspot), CONSP (hotspot)))
                 {
@@ -21583,6 +21729,8 @@ syms_of_xdisp ()
   staticpro (&Qspace_width);
   Qraise = intern ("raise");
   staticpro (&Qraise);
+  Qslice = intern ("slice");
+  staticpro (&Qslice);
   Qspace = intern ("space");
   staticpro (&Qspace);
   Qmargin = intern ("margin");
diff --git a/src/xterm.c b/src/xterm.c
index ea82a435b2b..838d4f2ad4b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -982,7 +982,8 @@ static void x_draw_image_foreground_1 P_ ((struct glyph_string *, Pixmap));
 static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int,
                                            int, int, int));
 static void x_draw_relief_rect P_ ((struct frame *, int, int, int, int,
-                                    int, int, int, int, XRectangle *));
+                                    int, int, int, int, int, int,
+                                    XRectangle *));
 static void x_draw_box_rect P_ ((struct glyph_string *, int, int, int, int,
                                  int, int, int, XRectangle *));
 
@@ -2021,9 +2022,10 @@ x_setup_relief_colors (s)
 
 static void
 x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
-                    raised_p, left_p, right_p, clip_rect)
+                    raised_p, top_p, bot_p, left_p, right_p, clip_rect)
      struct frame *f;
-     int left_x, top_y, right_x, bottom_y, width, left_p, right_p, raised_p;
+     int left_x, top_y, right_x, bottom_y, width;
+     int top_p, bot_p, left_p, right_p, raised_p;
      XRectangle *clip_rect;
 {
   Display *dpy = FRAME_X_DISPLAY (f);
@@ -2038,10 +2040,11 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
   XSetClipRectangles (dpy, gc, 0, 0, clip_rect, 1, Unsorted);
 
   /* Top.  */
-  for (i = 0; i < width; ++i)
-    XDrawLine (dpy, window, gc,
-               left_x + i * left_p, top_y + i,
-               right_x + 1 - i * right_p, top_y + i);
+  if (top_p)
+    for (i = 0; i < width; ++i)
+      XDrawLine (dpy, window, gc,
+                 left_x + i * left_p, top_y + i,
+                 right_x + 1 - i * right_p, top_y + i);
 
   /* Left.  */
   if (left_p)
@@ -2057,10 +2060,11 @@ x_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width,
   XSetClipRectangles (dpy, gc, 0, 0, clip_rect, 1, Unsorted);
 
   /* Bottom.  */
-  for (i = 0; i < width; ++i)
-    XDrawLine (dpy, window, gc,
-               left_x + i * left_p, bottom_y - i,
-               right_x + 1 - i * right_p, bottom_y - i);
+  if (bot_p)
+    for (i = 0; i < width; ++i)
+      XDrawLine (dpy, window, gc,
+                 left_x + i * left_p, bottom_y - i,
+                 right_x + 1 - i * right_p, bottom_y - i);
 
   /* Right.  */
   if (right_p)
@@ -2168,7 +2172,7 @@ x_draw_glyph_string_box (s)
     {
       x_setup_relief_colors (s);
       x_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y,
-                          width, raised_p, left_p, right_p, &clip_rect);
+                          width, raised_p, 1, 1, left_p, right_p, &clip_rect);
     }
 }
 
@@ -2179,21 +2183,22 @@ static void
 x_draw_image_foreground (s)
      struct glyph_string *s;
 {
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->img->pixmap)
     {
@@ -2218,11 +2223,12 @@ x_draw_image_foreground (s)
           get_glyph_string_clip_rect (s, &clip_rect);
           image_rect.x = x;
           image_rect.y = y;
-          image_rect.width = s->img->width;
-          image_rect.height = s->img->height;
+          image_rect.width = s->slice.width;
+          image_rect.height = s->slice.height;
           if (x_intersect_rectangles (&clip_rect, &image_rect, &r))
             XCopyArea (s->display, s->img->pixmap, s->window, s->gc,
-                       r.x - x, r.y - y, r.width, r.height, r.x, r.y);
+                       s->slice.x + r.x - x, s->slice.y + r.y - y,
+                       r.width, r.height, r.x, r.y);
         }
       else
         {
@@ -2231,11 +2237,12 @@ x_draw_image_foreground (s)
           get_glyph_string_clip_rect (s, &clip_rect);
           image_rect.x = x;
           image_rect.y = y;
-          image_rect.width = s->img->width;
-          image_rect.height = s->img->height;
+          image_rect.width = s->slice.width;
+          image_rect.height = s->slice.height;
           if (x_intersect_rectangles (&clip_rect, &image_rect, &r))
             XCopyArea (s->display, s->img->pixmap, s->window, s->gc,
-                       r.x - x, r.y - y, r.width, r.height, r.x, r.y);
+                       s->slice.x + r.x - x, s->slice.y + r.y - y,
+                       r.width, r.height, r.x, r.y);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2247,15 +2254,17 @@ x_draw_image_foreground (s)
             {
               int r = s->img->relief;
               if (r < 0) r = -r;
-              XDrawRectangle (s->display, s->window, s->gc, x - r, y - r,
-                              s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+              XDrawRectangle (s->display, s->window, s->gc,
+                              x - r, y - r,
+                              s->slice.width + r*2 - 1,
+                              s->slice.height + r*2 - 1);
             }
         }
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     XDrawRectangle (s->display, s->window, s->gc, x, y,
-                    s->img->width - 1, s->img->height - 1);
+                    s->slice.width - 1, s->slice.height - 1);
 }
 
 
@@ -2267,21 +2276,22 @@ x_draw_image_relief (s)
 {
   int x0, y0, x1, y1, thick, raised_p;
   XRectangle r;
-  int x;
-  int y = s->ybase - image_ascent (s->img, s->face);
+  int x = s->x;
+  int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = s->x + abs (s->face->box_line_width);
-  else
-    x = s->x;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->hl == DRAW_IMAGE_SUNKEN
       || s->hl == DRAW_IMAGE_RAISED)
@@ -2297,12 +2307,17 @@ x_draw_image_relief (s)
 
   x0 = x - thick;
   y0 = y - thick;
-  x1 = x + s->img->width + thick - 1;
-  y1 = y + s->img->height + thick - 1;
+  x1 = x + s->slice.width + thick - 1;
+  y1 = y + s->slice.height + thick - 1;
 
   x_setup_relief_colors (s);
   get_glyph_string_clip_rect (s, &r);
-  x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r);
+  x_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p,
+                      s->slice.y == 0,
+                      s->slice.y + s->slice.height == s->img->height,
+                      s->slice.x == 0,
+                      s->slice.x + s->slice.width == s->img->width,
+                      &r);
 }
 
 
@@ -2313,21 +2328,22 @@ x_draw_image_foreground_1 (s, pixmap)
      struct glyph_string *s;
      Pixmap pixmap;
 {
-  int x;
-  int y = s->ybase - s->y - image_ascent (s->img, s->face);
+  int x = 0;
+  int y = s->ybase - s->y - image_ascent (s->img, s->face, &s->slice);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
   if (s->face->box != FACE_NO_BOX
-      && s->first_glyph->left_box_line_p)
-    x = abs (s->face->box_line_width);
-  else
-    x = 0;
+      && s->first_glyph->left_box_line_p
+      && s->slice.x == 0)
+    x += abs (s->face->box_line_width);
 
   /* If there is a margin around the image, adjust x- and y-position
      by that margin.  */
-  x += s->img->hmargin;
-  y += s->img->vmargin;
+  if (s->slice.x == 0)
+    x += s->img->hmargin;
+  if (s->slice.y == 0)
+    y += s->img->vmargin;
 
   if (s->img->pixmap)
     {
@@ -2349,13 +2365,15 @@ x_draw_image_foreground_1 (s, pixmap)
           XChangeGC (s->display, s->gc, mask, &xgcv);
 
           XCopyArea (s->display, s->img->pixmap, pixmap, s->gc,
-                     0, 0, s->img->width, s->img->height, x, y);
+                     s->slice.x, s->slice.y,
+                     s->slice.width, s->slice.height, x, y);
           XSetClipMask (s->display, s->gc, None);
         }
       else
         {
           XCopyArea (s->display, s->img->pixmap, pixmap, s->gc,
-                     0, 0, s->img->width, s->img->height, x, y);
+                     s->slice.x, s->slice.y,
+                     s->slice.width, s->slice.height, x, y);
 
           /* When the image has a mask, we can expect that at
              least part of a mouse highlight or a block cursor will
@@ -2368,14 +2386,15 @@ x_draw_image_foreground_1 (s, pixmap)
               int r = s->img->relief;
               if (r < 0) r = -r;
               XDrawRectangle (s->display, s->window, s->gc, x - r, y - r,
-                              s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+                              s->slice.width + r*2 - 1,
+                              s->slice.height + r*2 - 1);
             }
         }
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     XDrawRectangle (s->display, pixmap, s->gc, x, y,
-                    s->img->width - 1, s->img->height - 1);
+                    s->slice.width - 1, s->slice.height - 1);
 }
 
 
@@ -2417,33 +2436,28 @@ static void
 x_draw_image_glyph_string (s)
      struct glyph_string *s;
 {
-  int x, y;
   int box_line_hwidth = abs (s->face->box_line_width);
   int box_line_vwidth = max (s->face->box_line_width, 0);
   int height;
   Pixmap pixmap = None;
 
-  height = s->height - 2 * box_line_vwidth;
-
+  height = s->height;
+  if (s->slice.y == 0)
+    height -= box_line_vwidth;
+  if (s->slice.y + s->slice.height >= s->img->height)
+    height -= box_line_vwidth;
 
   /* Fill background with face under the image.  Do it only if row is
      taller than image or if image has a clip mask to reduce
      flickering.  */
   s->stippled_p = s->face->stipple != 0;
-  if (height > s->img->height
+  if (height > s->slice.height
       || s->img->hmargin
       || s->img->vmargin
       || s->img->mask
       || s->img->pixmap == 0
       || s->width != s->background_width)
     {
-      if (box_line_hwidth && s->first_glyph->left_box_line_p)
-        x = s->x + box_line_hwidth;
-      else
-        x = s->x;
-
-      y = s->y + box_line_vwidth;
-
       if (s->img->mask)
         {
           /* Create a pixmap as large as the glyph string.  Fill it
@@ -2482,7 +2496,19 @@ x_draw_image_glyph_string (s)
             }
         }
       else
-        x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height);
+        {
+          int x = s->x;
+          int y = s->y;
+
+          if (s->first_glyph->left_box_line_p
+              && s->slice.x == 0)
+            x += box_line_hwidth;
+
+          if (s->slice.y == 0)
+            y += box_line_vwidth;
+
+          x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height);
+        }
 
       s->background_filled_p = 1;
     }
diff --git a/src/xterm.h b/src/xterm.h
index a350567cd46..56c1d059ac3 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -941,7 +941,6 @@ Lisp_Object display_x_get_resource P_ ((struct x_display_info *,
 struct frame *check_x_frame P_ ((Lisp_Object));
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
-int image_ascent P_ ((struct image *, struct face *));
 extern void x_free_gcs P_ ((struct frame *));
 
 /* From xrdb.c.  */