Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
   Merge from gnus--rel--5.10

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
   Update from CVS

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

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index 7cb9c0c92eba7bb437b917e69563daa79e66ca36,61ea98b37ef4a2cd32b16f3c177380cd48f7ea7e..88eaedef087d04b81b7b4eaceb18346ab162f443
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -3449,9 -3453,9 +3449,9 @@@ handle_single_display_spec (it, spec, o
        && EQ (XCAR (spec), Qheight)
        && CONSP (XCDR (spec)))
      {
 -      if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
 +      if (!FRAME_WINDOW_P (it->f))
        return 0;
-       
+ 
        it->font_height = XCAR (XCDR (spec));
        if (!NILP (it->font_height))
        {

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge