comparison src/xterm.h @ 90070:95879cc1ed20

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751 - 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 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80 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
author Miles Bader <miles@gnu.org>
date Sun, 02 Jan 2005 09:13:19 +0000
parents b637c617432f d0fe8e91ef27
children cb67264d6096
comparison
equal deleted inserted replaced
90069:fa0a5c4db2c8 90070:95879cc1ed20
315 Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL, 315 Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL,
316 Xatom_ATOM_PAIR; 316 Xatom_ATOM_PAIR;
317 317
318 /* More atoms for font properties. The last three are private 318 /* More atoms for font properties. The last three are private
319 properties, see the comments in src/fontset.h. */ 319 properties, see the comments in src/fontset.h. */
320 Atom Xatom_PIXEL_SIZE, 320 Atom Xatom_PIXEL_SIZE, Xatom_AVERAGE_WIDTH,
321 Xatom_MULE_BASELINE_OFFSET, Xatom_MULE_RELATIVE_COMPOSE, 321 Xatom_MULE_BASELINE_OFFSET, Xatom_MULE_RELATIVE_COMPOSE,
322 Xatom_MULE_DEFAULT_ASCENT; 322 Xatom_MULE_DEFAULT_ASCENT;
323 323
324 /* More atoms for Ghostscript support. */ 324 /* More atoms for Ghostscript support. */
325 Atom Xatom_DONE, Xatom_PAGE; 325 Atom Xatom_DONE, Xatom_PAGE;