comparison src/data.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents 9ad43877534d
children e45d5e7c476e
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
165 Lisp_Object 165 Lisp_Object
166 make_int (EMACS_INT num) 166 make_int (EMACS_INT num)
167 { 167 {
168 Lisp_Object val; 168 Lisp_Object val;
169 /* Don't use XSETINT here -- it's defined in terms of make_int (). */ 169 /* Don't use XSETINT here -- it's defined in terms of make_int (). */
170 XSETOBJ (val, Lisp_Int, num); 170 XSETOBJ (val, Lisp_Type_Int, num);
171 return val; 171 return val;
172 } 172 }
173 #endif /* ! defined (make_int) */ 173 #endif /* ! defined (make_int) */
174 174
175 /* On some machines, XINT needs a temporary location. 175 /* On some machines, XINT needs a temporary location.
193 futzing like with ints. */ 193 futzing like with ints. */
194 Lisp_Object 194 Lisp_Object
195 make_char (Emchar num) 195 make_char (Emchar num)
196 { 196 {
197 Lisp_Object val; 197 Lisp_Object val;
198 /* Don't use XSETCHAR here -- it's defined in terms of make_char (). */ 198 XSETOBJ (val, Lisp_Type_Char, num);
199 XSETOBJ (val, Lisp_Char, num);
200 return val; 199 return val;
201 } 200 }
202 201
203 /* Data type predicates */ 202 /* Data type predicates */
204 203
1755 1754
1756 Lisp_Object 1755 Lisp_Object
1757 make_weak_list (enum weak_list_type type) 1756 make_weak_list (enum weak_list_type type)
1758 { 1757 {
1759 Lisp_Object result = Qnil; 1758 Lisp_Object result = Qnil;
1760
1761 struct weak_list *wl = 1759 struct weak_list *wl =
1762 alloc_lcrecord (sizeof (struct weak_list), lrecord_weak_list); 1760 alloc_lcrecord_type (struct weak_list, lrecord_weak_list);
1761
1763 wl->list = Qnil; 1762 wl->list = Qnil;
1764 wl->type = type; 1763 wl->type = type;
1765 XSETWEAK_LIST (result, wl); 1764 XSETWEAK_LIST (result, wl);
1766 wl->next_weak = Vall_weak_lists; 1765 wl->next_weak = Vall_weak_lists;
1767 Vall_weak_lists = result; 1766 Vall_weak_lists = result;