comparison src/data.c @ 4998:b46c89ccbed3

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 06 Feb 2010 12:28:19 +0000
parents 16112448d484 c17c857e20bf
children 6afe991b8135 b5df3737028a
comparison
equal deleted inserted replaced
4994:76af7fc13e81 4998:b46c89ccbed3
295 DEFUN ("arrayp", Farrayp, 1, 1, 0, /* 295 DEFUN ("arrayp", Farrayp, 1, 1, 0, /*
296 Return t if OBJECT is an array (string, vector, or bit vector). 296 Return t if OBJECT is an array (string, vector, or bit vector).
297 */ 297 */
298 (object)) 298 (object))
299 { 299 {
300 return (VECTORP (object) || 300 return ARRAYP (object) ? Qt : Qnil;
301 STRINGP (object) ||
302 BIT_VECTORP (object))
303 ? Qt : Qnil;
304 } 301 }
305 302
306 DEFUN ("sequencep", Fsequencep, 1, 1, 0, /* 303 DEFUN ("sequencep", Fsequencep, 1, 1, 0, /*
307 Return t if OBJECT is a sequence (list or array). 304 Return t if OBJECT is a sequence (list or array).
308 */ 305 */
309 (object)) 306 (object))
310 { 307 {
311 return (LISTP (object) || 308 return SEQUENCEP (object) ? Qt : Qnil;
312 VECTORP (object) ||
313 STRINGP (object) ||
314 BIT_VECTORP (object))
315 ? Qt : Qnil;
316 } 309 }
317 310
318 DEFUN ("markerp", Fmarkerp, 1, 1, 0, /* 311 DEFUN ("markerp", Fmarkerp, 1, 1, 0, /*
319 Return t if OBJECT is a marker (editor pointer). 312 Return t if OBJECT is a marker (editor pointer).
320 */ 313 */