Merged in changes from CVS trunk.

Patches applied:

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
   Update from CVS: lispref/display.texi: emacs -> Emacs.

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

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

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

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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/xdisp.c
index 4a79521,2ae2a73..f01d3f0
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -18595,17 -18691,20 +18690,20 @@@ 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
 -        pcm = rif->per_char_metric (font, &char2b,
 -                                    FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
 -
 -        if (it->override_ascent >= 0)
 -          {
 -            it->ascent = it->override_ascent;
 -            it->descent = it->override_descent;
 -            boff = it->override_boff;
 -          }
 -        else
 -          {
 -            it->ascent = FONT_BASE (font) + boff;
 -            it->descent = FONT_DESCENT (font) - boff;
 -          }
++          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;
++        if (it->override_ascent >= 0)
++          {
++            it->ascent = it->override_ascent;
++            it->descent = it->override_descent;
++            boff = it->override_boff;
++          }
++        else
++          {
++            it->ascent = FONT_BASE (font) + boff;
++            it->descent = FONT_DESCENT (font) - boff;
++          }
  
          if (pcm)
            {