Mercurial > emacs
comparison src/xterm.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 | fac24544c283 488c36800dcc |
children | c5bae78b527c |
comparison
equal
deleted
inserted
replaced
83111:fd147ed0d1b8 | 83112:30dd490f06f2 |
---|---|
939 Lisp_Object, Lisp_Object, | 939 Lisp_Object, Lisp_Object, |
940 Lisp_Object, Lisp_Object)); | 940 Lisp_Object, Lisp_Object)); |
941 struct frame *check_x_frame P_ ((Lisp_Object)); | 941 struct frame *check_x_frame P_ ((Lisp_Object)); |
942 EXFUN (Fx_display_color_p, 1); | 942 EXFUN (Fx_display_color_p, 1); |
943 EXFUN (Fx_display_grayscale_p, 1); | 943 EXFUN (Fx_display_grayscale_p, 1); |
944 int image_ascent P_ ((struct image *, struct face *)); | |
945 extern void x_free_gcs P_ ((struct frame *)); | 944 extern void x_free_gcs P_ ((struct frame *)); |
946 | 945 |
947 /* From xrdb.c. */ | 946 /* From xrdb.c. */ |
948 | 947 |
949 char *x_get_customization_string P_ ((XrmDatabase, char *, char *)); | 948 char *x_get_customization_string P_ ((XrmDatabase, char *, char *)); |