Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
   src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c

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

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

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

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

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

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

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

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/vc-hooks.el
Simple merge

diff --cc lisp/vc.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/xdisp.c
index fd621fe,2ef3722..d5e12e6
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -18589,8 -18590,14 +18589,14 @@@ x_produce_glyphs (it
  
          it->nglyphs = 1;
  
 -        if (it->use_default_face)
 -          {
 -            font = FRAME_FONT (it->f);
 -            boff = FRAME_BASELINE_OFFSET (it->f);
 -          }
 -
 -        pcm = rif->per_char_metric (font, &char2b,
 -                                    FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
++        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));
  
          it->ascent = FONT_BASE (font) + boff;
          it->descent = FONT_DESCENT (font) - boff;

diff --cc src/xfaces.c
Simple merge

diff --cc src/xterm.c
Simple merge