comparison src/fns.c @ 108116:8cf84fb217cc

merge trunk
author Kenichi Handa <handa@etlken>
date Mon, 26 Apr 2010 10:22:02 +0900
parents 641672d44942
children 5582106cddf0
comparison
equal deleted inserted replaced
108115:cd095471cdae 108116:8cf84fb217cc
390 /* ARGSUSED */ 390 /* ARGSUSED */
391 Lisp_Object 391 Lisp_Object
392 concat2 (s1, s2) 392 concat2 (s1, s2)
393 Lisp_Object s1, s2; 393 Lisp_Object s1, s2;
394 { 394 {
395 #ifdef NO_ARG_ARRAY
396 Lisp_Object args[2]; 395 Lisp_Object args[2];
397 args[0] = s1; 396 args[0] = s1;
398 args[1] = s2; 397 args[1] = s2;
399 return concat (2, args, Lisp_String, 0); 398 return concat (2, args, Lisp_String, 0);
400 #else
401 return concat (2, &s1, Lisp_String, 0);
402 #endif /* NO_ARG_ARRAY */
403 } 399 }
404 400
405 /* ARGSUSED */ 401 /* ARGSUSED */
406 Lisp_Object 402 Lisp_Object
407 concat3 (s1, s2, s3) 403 concat3 (s1, s2, s3)
408 Lisp_Object s1, s2, s3; 404 Lisp_Object s1, s2, s3;
409 { 405 {
410 #ifdef NO_ARG_ARRAY
411 Lisp_Object args[3]; 406 Lisp_Object args[3];
412 args[0] = s1; 407 args[0] = s1;
413 args[1] = s2; 408 args[1] = s2;
414 args[2] = s3; 409 args[2] = s3;
415 return concat (3, args, Lisp_String, 0); 410 return concat (3, args, Lisp_String, 0);
416 #else
417 return concat (3, &s1, Lisp_String, 0);
418 #endif /* NO_ARG_ARRAY */
419 } 411 }
420 412
421 DEFUN ("append", Fappend, Sappend, 0, MANY, 0, 413 DEFUN ("append", Fappend, Sappend, 0, MANY, 0,
422 doc: /* Concatenate all the arguments and make the result a list. 414 doc: /* Concatenate all the arguments and make the result a list.
423 The result is a list whose elements are the elements of all the arguments. 415 The result is a list whose elements are the elements of all the arguments.
2342 /* ARGSUSED */ 2334 /* ARGSUSED */
2343 Lisp_Object 2335 Lisp_Object
2344 nconc2 (s1, s2) 2336 nconc2 (s1, s2)
2345 Lisp_Object s1, s2; 2337 Lisp_Object s1, s2;
2346 { 2338 {
2347 #ifdef NO_ARG_ARRAY
2348 Lisp_Object args[2]; 2339 Lisp_Object args[2];
2349 args[0] = s1; 2340 args[0] = s1;
2350 args[1] = s2; 2341 args[1] = s2;
2351 return Fnconc (2, args); 2342 return Fnconc (2, args);
2352 #else
2353 return Fnconc (2, &s1);
2354 #endif /* NO_ARG_ARRAY */
2355 } 2343 }
2356 2344
2357 DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0, 2345 DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0,
2358 doc: /* Concatenate any number of lists by altering them. 2346 doc: /* Concatenate any number of lists by altering them.
2359 Only the last argument is not altered, and need not be a list. 2347 Only the last argument is not altered, and need not be a list.