From: Karoly Lorentey <lorentey@elte.hu>
Date: Thu, 6 Jan 2005 15:05:01 +0000 (+0000)
Subject: Merged in changes from CVS trunk.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~319
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd41924555942f6c3c1e12400ab313717a3818cd;p=emacs.git

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
---

fd41924555942f6c3c1e12400ab313717a3818cd
diff --cc src/xdisp.c
index 7cb9c0c92eb,61ea98b37ef..88eaedef087
--- a/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))
  	{