comparison src/objects-x.c @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
comparison
equal deleted inserted replaced
770:336a418893b5 771:943eaba38521
1 /* X-specific Lisp objects. 1 /* X-specific Lisp objects.
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems. 4 Copyright (C) 1995 Tinker Systems.
5 Copyright (C) 1995, 1996, 2000 Ben Wing. 5 Copyright (C) 1995, 1996, 2000, 2001 Ben Wing.
6 Copyright (C) 1995 Sun Microsystems, Inc. 6 Copyright (C) 1995 Sun Microsystems, Inc.
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
10 XEmacs is free software; you can redistribute it and/or modify it 10 XEmacs is free software; you can redistribute it and/or modify it
32 #include "lisp.h" 32 #include "lisp.h"
33 33
34 #include "console-x.h" 34 #include "console-x.h"
35 #include "objects-x.h" 35 #include "objects-x.h"
36 36
37 #include "buffer.h" 37 #include "charset.h"
38 #include "device.h" 38 #include "device.h"
39 #include "insdel.h" 39 #include "insdel.h"
40 40
41 int x_handle_non_fully_specified_fonts; 41 int x_handle_non_fully_specified_fonts;
42 42
823 if (namestrext) 823 if (namestrext)
824 TO_INTERNAL_FORMAT (C_STRING, namestrext, 824 TO_INTERNAL_FORMAT (C_STRING, namestrext,
825 ALLOCA, (name_str, name_len), 825 ALLOCA, (name_str, name_len),
826 Qx_atom_name_encoding); 826 Qx_atom_name_encoding);
827 827
828 name = (name_str ? intern ((char *) name_str) : Qnil); 828 name = (name_str ? intern_int (name_str) : Qnil);
829 if (name_str && 829 if (name_str &&
830 (atom == XA_FONT || 830 (atom == XA_FONT ||
831 atom == DEVICE_XATOM_FOUNDRY (d) || 831 atom == DEVICE_XATOM_FOUNDRY (d) ||
832 atom == DEVICE_XATOM_FAMILY_NAME (d) || 832 atom == DEVICE_XATOM_FAMILY_NAME (d) ||
833 atom == DEVICE_XATOM_WEIGHT_NAME (d) || 833 atom == DEVICE_XATOM_WEIGHT_NAME (d) ||