comparison src/w32term.h @ 83112:30dd490f06f2

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-231 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-232 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-233 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-234 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-235 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-236 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-237 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-238 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-239 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-240 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-152
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 23 Apr 2004 14:44:11 +0000
parents dd3018b4785b 488c36800dcc
children 14e5707213a6
comparison
equal deleted inserted replaced
83111:fd147ed0d1b8 83112:30dd490f06f2
717 717
718 XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *); 718 XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
719 struct frame * check_x_frame (Lisp_Object); 719 struct frame * check_x_frame (Lisp_Object);
720 EXFUN (Fx_display_color_p, 1); 720 EXFUN (Fx_display_color_p, 1);
721 EXFUN (Fx_display_grayscale_p, 1); 721 EXFUN (Fx_display_grayscale_p, 1);
722 int image_ascent P_ ((struct image *, struct face *));
723 722
724 #define FONT_TYPE_FOR_UNIBYTE(font, ch) \ 723 #define FONT_TYPE_FOR_UNIBYTE(font, ch) \
725 ((font)->bdf ? BDF_1D_FONT : ANSI_FONT) 724 ((font)->bdf ? BDF_1D_FONT : ANSI_FONT)
726 725
727 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) \ 726 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) \