13 files changed, 234 insertions, 102 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6bc622c8bff..4db9b8cb4d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,64 @@
+2004-04-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (x_produce_glyphs): Fix last change; handle newline in
+        header line strings.
+
+        * dispextern.h (struct it): New member use_default_face.
+
+        * xdisp.c (Qline_height): New variable.
+        (syms_of_xdisp): Intern and staticpro it.
+        (append_space_for_newline): Partially undo 2004-04-25 change;
+        add default_face_p arg, and restore callers.
+        Clear it->use_default_face after use.
+        (x_produce_glyphs): Set default font for ascii char if
+        it->use_default_font is set.  Change line-spacing property to set
+        just extra line spacing.  Handle new line-height property.
+
+2004-04-26  Andreas Schwab  <schwab@suse.de>
+
+        * print.c (print_object): Print non-ascii characters in bool
+        vector representation as octal escapes.
+
+        * lisp.h (BOOL_VECTOR_BITS_PER_CHAR): Define.
+        * print.c (print_object): Use it instead of BITS_PER_CHAR for
+        bool vectors.
+        * lread.c (read1): Likewise.
+        * alloc.c (Fmake_bool_vector): Likewise.
+        * data.c (Faref, Faset): Likewise.
+        * fns.c (Fcopy_sequence, concat, internal_equal, Ffillarray)
+        (mapcar1): Likewise.
+
+2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
+
+        * lread.c (init_lread): Fixing typo HAVE_CARBON test logic
+
+2004-04-26  Miles Bader  <miles@gnu.org>
+
+        * lisp.h (CYCLE_CHECK): Macro moved from xfaces.c.
+
+2004-04-26  Juanma Barranquero  <lektu@terra.es>
+
+        * buffer.c (Fpop_to_buffer): Fix docstring.
+
+2004-04-26  Steven Tamm  <steventamm@mac.com>
+
+        * lread.c (init_lread): Don't display missing lisp directory
+        warnings with Carbon Emacs because self-contained bundled Emacs
+        may be built without correct installation path.
+
+2004-04-25  Kim F. Storm  <storm@cua.dk>
+
+        * macterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.
+
+        * xterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.
+
+        * xdisp.c (append_space_for_newline): Rename from append_space.
+        Remove DEFAULT_FACE_P arg; always use current face.  Callers changed.
+        (x_produce_glyphs): Handle line-spacing property on newline char.
+        If value is t, adjust ascent and descent to fit current row height.
+        If value is an integer or float, set extra_line_spacing to integer
+        value, or to float value x current line height.
+
 2004-04-23  Kenichi Handa  <handa@m17n.org>
 
         * fontset.c (Finternal_char_font): If POSITION is nil, return
@@ -37,7 +98,7 @@
 
         * lisp.h (pos_visible_p): Fix prototype.
 
-        * macterm.c (x_draw_relief_rect):  Add top_p and bot_p args.
+        * 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):
@@ -8334,12 +8395,11 @@
 
 2002-07-19  Juanma Barranquero  <lektu@terra.es>
 
-        * fileio.c (Ffile_name_as_directory): Fix argument name in docstring.
-        (file_name_as_directory): Use literal '/' instead of DIRECTORY_SEP.
-
         * xdisp.c (syms_of_xdisp): Remove redundant deprecation info.
 
         * fileio.c (syms_of_fileio): Likewise.
+        (Ffile_name_as_directory): Fix argument name in docstring.
+        (file_name_as_directory): Use literal '/' instead of DIRECTORY_SEP.
 
 2002-07-18  Richard M. Stallman  <rms@gnu.org>
 
@@ -11989,9 +12049,9 @@
 
         * abbrev.c (Fexpand_abbrev): Use Frun_hooks instead of Vrun_hooks.
 
-        * buffer.c (Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
+        * buffer.c (Fkill_buffer): Likewise.
 
-        * print.c (temp_output_buffer_setup): Use Frun_hooks, not Vrun_hooks.
+        * print.c (temp_output_buffer_setup): Likewise.
 
 2001-11-25  Stefan Monnier  <monnier@cs.yale.edu>
 
diff --git a/src/alloc.c b/src/alloc.c
index 723d664cbe0..29351952860 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1950,10 +1950,11 @@ LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
 
   CHECK_NATNUM (length);
 
-  bits_per_value = sizeof (EMACS_INT) * BITS_PER_CHAR;
+  bits_per_value = sizeof (EMACS_INT) * BOOL_VECTOR_BITS_PER_CHAR;
 
   length_in_elts = (XFASTINT (length) + bits_per_value - 1) / bits_per_value;
-  length_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1) / BITS_PER_CHAR);
+  length_in_chars = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
+                     / BOOL_VECTOR_BITS_PER_CHAR);
 
   /* We must allocate one more elements than LENGTH_IN_ELTS for the
      slot `size' of the struct Lisp_Bool_Vector.  */
@@ -1970,9 +1971,9 @@ LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
     p->data[i] = real_init;
 
   /* Clear the extraneous bits in the last byte.  */
-  if (XINT (length) != length_in_chars * BITS_PER_CHAR)
+  if (XINT (length) != length_in_chars * BOOL_VECTOR_BITS_PER_CHAR)
     XBOOL_VECTOR (val)->data[length_in_chars - 1]
-      &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1;
+      &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
 
   return val;
 }
diff --git a/src/buffer.c b/src/buffer.c
index 6e67f07cf38..db16b22e35a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1683,7 +1683,7 @@ DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
        doc: /* Select buffer BUFFER in some window, preferably a different one.
 If BUFFER is nil, then some other buffer is chosen.
 If `pop-up-windows' is non-nil, windows can be split to do this.
-If optional second arg OTHER-WINDOW is nil, insist on finding another
+If optional second arg OTHER-WINDOW is non-nil, insist on finding another
 window even if BUFFER is already visible in the selected window,
 and ignore `same-window-regexps' and `same-window-buffer-names'.
 This uses the function `display-buffer' as a subroutine; see the documentation
diff --git a/src/data.c b/src/data.c
index c3cf05e0f10..a5f28375635 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1946,8 +1946,8 @@ or a byte-code object.  IDX starts at 0.  */)
       if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
         args_out_of_range (array, idx);
 
-      val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR];
-      return (val & (1 << (idxval % BITS_PER_CHAR)) ? Qt : Qnil);
+      val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR];
+      return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil);
     }
   else if (CHAR_TABLE_P (array))
     {
@@ -2074,13 +2074,13 @@ bool-vector.  IDX starts at 0.  */)
       if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size)
         args_out_of_range (array, idx);
 
-      val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR];
+      val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR];
 
       if (! NILP (newelt))
-        val |= 1 << (idxval % BITS_PER_CHAR);
+        val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR);
       else
-        val &= ~(1 << (idxval % BITS_PER_CHAR));
-      XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR] = val;
+        val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR));
+      XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val;
     }
   else if (CHAR_TABLE_P (array))
     {
diff --git a/src/dispextern.h b/src/dispextern.h
index a3fc28e2491..8e79211b319 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1920,9 +1920,12 @@ struct it
   unsigned face_before_selective_p : 1;
 
   /* If 1, adjust current glyph so it does not increase current row
-     descent/ascent.  */
+     descent/ascent (line-height property).  Reset after this glyph.  */
   unsigned constrain_row_ascent_descent_p : 1;
 
+  /* If 1, show current glyph in default face.  Reset after this glyph.  */
+  unsigned use_default_face : 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;
diff --git a/src/fns.c b/src/fns.c
index bb215317864..1dbb9fb7c33 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,5 +1,5 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001, 02, 2003
+   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001, 02, 03, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -513,7 +513,8 @@ with the original. */)
     {
       Lisp_Object val;
       int size_in_chars
-        = (XBOOL_VECTOR (arg)->size + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+        = ((XBOOL_VECTOR (arg)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
+           / BOOL_VECTOR_BITS_PER_CHAR);
 
       val = Fmake_bool_vector (Flength (arg), Qnil);
       bcopy (XBOOL_VECTOR (arg)->data, XBOOL_VECTOR (val)->data,
@@ -783,8 +784,8 @@ concat (nargs, args, target_type, last_special)
             else if (BOOL_VECTOR_P (this))
               {
                 int byte;
-                byte = XBOOL_VECTOR (this)->data[thisindex / BITS_PER_CHAR];
-                if (byte & (1 << (thisindex % BITS_PER_CHAR)))
+                byte = XBOOL_VECTOR (this)->data[thisindex / BOOL_VECTOR_BITS_PER_CHAR];
+                if (byte & (1 << (thisindex % BOOL_VECTOR_BITS_PER_CHAR)))
                   elt = Qt;
                 else
                   elt = Qnil;
@@ -2245,7 +2246,8 @@ internal_equal (o1, o2, depth, props)
         if (BOOL_VECTOR_P (o1))
           {
             int size_in_chars
-              = (XBOOL_VECTOR (o1)->size + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+              = ((XBOOL_VECTOR (o1)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
+                 / BOOL_VECTOR_BITS_PER_CHAR);
 
             if (XBOOL_VECTOR (o1)->size != XBOOL_VECTOR (o2)->size)
               return 0;
@@ -2356,7 +2358,8 @@ ARRAY is a vector, string, char-table, or bool-vector.  */)
     {
       register unsigned char *p = XBOOL_VECTOR (array)->data;
       int size_in_chars
-        = (XBOOL_VECTOR (array)->size + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+        = ((XBOOL_VECTOR (array)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
+           / BOOL_VECTOR_BITS_PER_CHAR);
 
       charval = (! NILP (item) ? -1 : 0);
       for (index = 0; index < size_in_chars - 1; index++)
@@ -2364,8 +2367,8 @@ ARRAY is a vector, string, char-table, or bool-vector.  */)
       if (index < size_in_chars)
         {
           /* Mask out bits beyond the vector size.  */
-          if (XBOOL_VECTOR (array)->size % BITS_PER_CHAR)
-            charval &= (1 << (XBOOL_VECTOR (array)->size % BITS_PER_CHAR)) - 1;
+          if (XBOOL_VECTOR (array)->size % BOOL_VECTOR_BITS_PER_CHAR)
+            charval &= (1 << (XBOOL_VECTOR (array)->size % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
           p[index] = charval;
         }
     }
@@ -2958,8 +2961,8 @@ mapcar1 (leni, vals, fn, seq)
       for (i = 0; i < leni; i++)
         {
           int byte;
-          byte = XBOOL_VECTOR (seq)->data[i / BITS_PER_CHAR];
-          if (byte & (1 << (i % BITS_PER_CHAR)))
+          byte = XBOOL_VECTOR (seq)->data[i / BOOL_VECTOR_BITS_PER_CHAR];
+          if (byte & (1 << (i % BOOL_VECTOR_BITS_PER_CHAR)))
             dummy = Qt;
           else
             dummy = Qnil;
diff --git a/src/lisp.h b/src/lisp.h
index bc67f4dbe67..7e59c50c3b4 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -278,6 +278,10 @@ enum pvec_type
 
 /* For convenience, we also store the number of elements in these bits.  */
 #define PSEUDOVECTOR_SIZE_MASK 0x1ff
+
+/* Number of bits to put in each character in the internal representation
+   of bool vectors.  This should not vary across implementations.  */
+#define BOOL_VECTOR_BITS_PER_CHAR 8
 
 /***** Select the tagging scheme.  *****/
 
@@ -3187,6 +3191,32 @@ extern Lisp_Object Vdirectory_sep_char;
     ? make_float (val) \
     : make_number ((EMACS_INT)(val)))
 
+
+/* Checks the `cycle check' variable CHECK to see if it indicates that
+   EL is part of a cycle; CHECK must be either Qnil or a value returned
+   by an earlier use of CYCLE_CHECK.  SUSPICIOUS is the number of
+   elements after which a cycle might be suspected; after that many
+   elements, this macro begins consing in order to keep more precise
+   track of elements.
+
+   Returns nil if a cycle was detected, otherwise a new value for CHECK
+   that includes EL.
+
+   CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
+   the caller should make sure that's ok.  */
+
+#define CYCLE_CHECK(check, el, suspicious)      \
+  (NILP (check)                                 \
+   ? make_number (0)                            \
+   : (INTEGERP (check)                          \
+      ? (XFASTINT (check) < (suspicious)        \
+         ? make_number (XFASTINT (check) + 1)   \
+         : Fcons (el, Qnil))                    \
+      : (!NILP (Fmemq ((el), (check)))          \
+         ? Qnil                                 \
+         : Fcons ((el), (check)))))
+
+
 #endif /* EMACS_LISP_H */
 
 /* arch-tag: 9b2ed020-70eb-47ac-94ee-e1c2a5107d5e
diff --git a/src/lread.c b/src/lread.c
index ac353c798dc..46fe6cd3e51 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1994,8 +1994,9 @@ read1 (readcharfun, pch, first_in_list)
           if (c == '"')
             {
               Lisp_Object tmp, val;
-              int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1)
-                                   / BITS_PER_CHAR);
+              int size_in_chars
+                = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
+                   / BOOL_VECTOR_BITS_PER_CHAR);
 
               UNREAD (c);
               tmp = read1 (readcharfun, pch, first_in_list);
@@ -2004,7 +2005,7 @@ read1 (readcharfun, pch, first_in_list)
                      when the number of bits was a multiple of 8.
                      Accept such input in case it came from an old version.  */
                   && ! (XFASTINT (length)
-                        == (SCHARS (tmp) - 1) * BITS_PER_CHAR))
+                        == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR))
                 Fsignal (Qinvalid_read_syntax,
                          Fcons (make_string ("#&...", 5), Qnil));
 
@@ -2012,9 +2013,9 @@ read1 (readcharfun, pch, first_in_list)
               bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data,
                      size_in_chars);
               /* Clear the extraneous bits in the last byte.  */
-              if (XINT (length) != size_in_chars * BITS_PER_CHAR)
+              if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR)
                 XBOOL_VECTOR (val)->data[size_in_chars - 1]
-                  &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1;
+                  &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
               return val;
             }
           Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),
@@ -3677,11 +3678,15 @@ init_lread ()
     }
 #endif
 
-#ifndef WINDOWSNT
+#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON))))
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
      almost never correct, thereby causing a warning to be printed out that
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
-     EMACSLOADPATH environment variable below, disable the warning on NT.  */
+     EMACSLOADPATH environment variable below, disable the warning on NT.  
+     Also, when using the "self-contained" option for Carbon Emacs for MacOSX,
+     the "standard" paths may not exist and would be overridden by
+     EMACSLOADPATH as on NT.  Since this depends on how the executable
+     was build and packaged, turn off the warnings in general */
 
   /* Warn if dirs in the *standard* path don't exist.  */
   if (!turn_off_warning)
@@ -3703,7 +3708,7 @@ init_lread ()
             }
         }
     }
-#endif /* WINDOWSNT */
+#endif /* !(WINDOWSNT || HAVE_CARBON) */
 
   /* If the EMACSLOADPATH environment variable is set, use its value.
      This doesn't apply if we're dumping.  */
diff --git a/src/macterm.c b/src/macterm.c
index 88f5fce468c..e825cc2b022 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4665,7 +4665,8 @@ x_draw_hollow_cursor (w, row)
   /* Compute the proper height and ascent of the rectangle, based
      on the actual glyph.  Using the full height of the row looks
      bad when there are tall images on that row.  */
-  h = max (FRAME_LINE_HEIGHT (f), cursor_glyph->ascent + cursor_glyph->descent);
+  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
+           cursor_glyph->ascent + cursor_glyph->descent);
   if (h < row->height)
     y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
   h--;
diff --git a/src/print.c b/src/print.c
index 89690fe5399..7548bc75661 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,5 @@
 /* Lisp object printing and output streams.
-   Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 2003
+   Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 03, 2004
         Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1783,7 +1783,8 @@ print_object (obj, printcharfun, escapeflag)
           register unsigned char c;
           struct gcpro gcpro1;
           int size_in_chars
-            = (XBOOL_VECTOR (obj)->size + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+            = ((XBOOL_VECTOR (obj)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
+               / BOOL_VECTOR_BITS_PER_CHAR);
 
           GCPRO1 (obj);
 
@@ -1814,6 +1815,14 @@ print_object (obj, printcharfun, escapeflag)
                   PRINTCHAR ('\\');
                   PRINTCHAR ('f');
                 }
+              else if (c > '\177')
+                {
+                  /* Use octal escapes to avoid encoding issues.  */
+                  PRINTCHAR ('\\');
+                  PRINTCHAR ('0' + ((c >> 6) & 3));
+                  PRINTCHAR ('0' + ((c >> 3) & 7));
+                  PRINTCHAR ('0' + (c & 7));
+                }
               else
                 {
                   if (c == '\"' || c == '\\')
diff --git a/src/xdisp.c b/src/xdisp.c
index fd621fe301b..d5e12e68546 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -304,6 +304,7 @@ Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
 Lisp_Object Qslice;
 Lisp_Object Qcenter;
 Lisp_Object Qmargin, Qpointer;
+Lisp_Object Qline_height;
 extern Lisp_Object Qheight;
 extern Lisp_Object QCwidth, QCheight, QCascent;
 extern Lisp_Object Qscroll_bar;
@@ -846,7 +847,7 @@ static void insert_left_trunc_glyphs P_ ((struct it *));
 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *,
                                                           Lisp_Object));
 static void extend_face_to_end_of_line P_ ((struct it *));
-static int append_space P_ ((struct it *, int));
+static int append_space_for_newline P_ ((struct it *, int));
 static int make_cursor_line_fully_visible P_ ((struct window *, int));
 static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int, int));
 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
@@ -14144,8 +14145,7 @@ compute_line_metrics (it)
 
 
 /* Append one space to the glyph row of iterator IT if doing a
-   window-based redisplay.  DEFAULT_FACE_P non-zero means let the
-   space have the default face, otherwise let it have the same face as
+   window-based redisplay.  The space has the same face as
    IT->face_id.  Value is non-zero if a space was added.
 
    This function is called to make sure that there is always one glyph
@@ -14157,7 +14157,7 @@ compute_line_metrics (it)
    end of the line if the row ends in italic text.  */
 
 static int
-append_space (it, default_face_p)
+append_space_for_newline (it, default_face_p)
      struct it *it;
      int default_face_p;
 {
@@ -14171,7 +14171,7 @@ append_space (it, default_face_p)
           /* Save some values that must not be changed.
              Must save IT->c and IT->len because otherwise
              ITERATOR_AT_END_P wouldn't work anymore after
-             append_space has been called.  */
+             append_space_for_newline has been called.  */
           enum display_element_type saved_what = it->what;
           int saved_c = it->c, saved_len = it->len;
           int saved_x = it->current_x;
@@ -14196,11 +14196,9 @@ 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->use_default_face = 0;
           it->constrain_row_ascent_descent_p = 0;
           it->current_x = saved_x;
           it->object = saved_object;
@@ -14483,7 +14481,7 @@ display_line (it)
             row->exact_window_width_line_p = 1;
           else
 #endif /* HAVE_WINDOW_SYSTEM */
-          if ((append_space (it, 1) && row->used[TEXT_AREA] == 1)
+          if ((append_space_for_newline (it, 1) && row->used[TEXT_AREA] == 1)
               || row->used[TEXT_AREA] == 0)
             {
               row->glyphs[TEXT_AREA]->charpos = -1;
@@ -14725,7 +14723,7 @@ display_line (it)
           /* Add a space at the end of the line that is used to
              display the cursor there.  */
           if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
-            append_space (it, 0);
+            append_space_for_newline (it, 0);
 #endif /* HAVE_WINDOW_SYSTEM */
 
           /* Extend the face to the end of the line.  */
@@ -18514,6 +18512,8 @@ void
 x_produce_glyphs (it)
      struct it *it;
 {
+  int extra_line_spacing = it->extra_line_spacing;
+
   it->glyph_not_available_p = 0;
 
   if (it->what == IT_CHARACTER)
@@ -18589,6 +18589,12 @@ x_produce_glyphs (it)
 
           it->nglyphs = 1;
 
+          if (it->use_default_face)
+            {
+              font = FRAME_FONT (it->f);
+              boff = FRAME_BASELINE_OFFSET (it->f);
+            }
+ 
           pcm = FRAME_RIF (it->f)->per_char_metric
             (font, &char2b, FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
 
@@ -18612,18 +18618,19 @@ x_produce_glyphs (it)
           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);
-            }
+                {
+                  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);
+              extra_line_spacing = 0;
+            }
 
           /* If this is a space inside a region of text with
              `space-width' property, change its width.  */
@@ -18695,32 +18702,68 @@ x_produce_glyphs (it)
              But if previous part of the line set a height, don't
              increase that height */
 
+          Lisp_Object lsp, lh;
+
           it->pixel_width = 0;
           it->nglyphs = 0;
 
+          lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->object);
+
+          if (EQ (lh, Qt))
+            {
+              it->use_default_face = 1;
+              font = FRAME_FONT (it->f);
+              boff = FRAME_BASELINE_OFFSET (it->f);
+              font_info = NULL;
+            }
+
           it->ascent = FONT_BASE (font) + boff;
           it->descent = FONT_DESCENT (font) - boff;
 
-          if (it->max_ascent > 0 || it->max_descent > 0)
+          if (EQ (lh, make_number (0)))
             {
-              it->ascent = it->descent = 0;
+              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);
+              it->constrain_row_ascent_descent_p = 1;
+              extra_line_spacing = 0;
             }
           else
             {
-              it->ascent = FONT_BASE (font) + boff;
-              it->descent = FONT_DESCENT (font) - boff;
-            }
+              int explicit_height = -1;
+              it->phys_ascent = it->ascent;
+              it->phys_descent = it->descent;
 
-          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;
+                  it->descent += face->box_line_width;
+                }
+              if (INTEGERP (lh))
+                explicit_height = XINT (lh);
+              else if (FLOATP (lh))
+                explicit_height = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lh);
 
-          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;
-              it->descent += face->box_line_width;
+              if (explicit_height > it->ascent + it->descent)
+                it->ascent = explicit_height - it->descent;
             }
+
+          lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->object);
+          if (INTEGERP (lsp))
+            extra_line_spacing = XINT (lsp);
+          else if (FLOATP (lsp))
+            extra_line_spacing = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lsp);
         }
       else if (it->char_to_display == '\t')
         {
@@ -19097,7 +19140,7 @@ x_produce_glyphs (it)
   if (it->area == TEXT_AREA)
     it->current_x += it->pixel_width;
 
-  it->descent += it->extra_line_spacing;
+  it->descent += extra_line_spacing;
 
   it->max_ascent = max (it->max_ascent, it->ascent);
   it->max_descent = max (it->max_descent, it->descent);
@@ -21743,6 +21786,8 @@ syms_of_xdisp ()
   staticpro (&Qright_margin);
   Qcenter = intern ("center");
   staticpro (&Qcenter);
+  Qline_height = intern ("line-height");
+  staticpro (&Qline_height);
   QCalign_to = intern (":align-to");
   staticpro (&QCalign_to);
   QCrelative_width = intern (":relative-width");
diff --git a/src/xfaces.c b/src/xfaces.c
index 2e6d43a54b7..9e49833c736 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3482,32 +3482,6 @@ merge_face_vectors (f, from, to, cycle_check)
   to[LFACE_INHERIT_INDEX] = Qnil;
 }
 
-
-/* Checks the `cycle check' variable CHECK to see if it indicates that
-   EL is part of a cycle; CHECK must be either Qnil or a value returned
-   by an earlier use of CYCLE_CHECK.  SUSPICIOUS is the number of
-   elements after which a cycle might be suspected; after that many
-   elements, this macro begins consing in order to keep more precise
-   track of elements.
-
-   Returns nil if a cycle was detected, otherwise a new value for CHECK
-   that includes EL.
-
-   CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
-   the caller should make sure that's ok.  */
-
-#define CYCLE_CHECK(check, el, suspicious)      \
-  (NILP (check)                                 \
-   ? make_number (0)                            \
-   : (INTEGERP (check)                          \
-      ? (XFASTINT (check) < (suspicious)        \
-         ? make_number (XFASTINT (check) + 1)   \
-         : Fcons (el, Qnil))                    \
-      : (!NILP (Fmemq ((el), (check)))          \
-         ? Qnil                                 \
-         : Fcons ((el), (check)))))
-
-
 /* Merge face attributes from the face on frame F whose name is
    INHERITS, into the vector of face attributes TO; INHERITS may also be
    a list of face names, in which case they are applied in order.
diff --git a/src/xterm.c b/src/xterm.c
index 838d4f2ad4b..b8be6c13041 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7261,7 +7261,8 @@ x_draw_hollow_cursor (w, row)
   /* Compute the proper height and ascent of the rectangle, based
      on the actual glyph.  Using the full height of the row looks
      bad when there are tall images on that row.  */
-  h = max (FRAME_LINE_HEIGHT (f), cursor_glyph->ascent + cursor_glyph->descent);
+  h = max (min (FRAME_LINE_HEIGHT (f), row->height),
+           cursor_glyph->ascent + cursor_glyph->descent);
   if (h < row->height)
     y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;
   h--;