comparison src/buffer.c @ 4998:b46c89ccbed3

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 06 Feb 2010 12:28:19 +0000
parents 16112448d484 8431b52e43b1
children 6f2158fa75ed b5df3737028a
comparison
equal deleted inserted replaced
4994:76af7fc13e81 4998:b46c89ccbed3
372 If the FRAME argument is t, then the global (non-frame) ordering is 372 If the FRAME argument is t, then the global (non-frame) ordering is
373 returned instead. 373 returned instead.
374 */ 374 */
375 (frame)) 375 (frame))
376 { 376 {
377 return Fmapcar (Qcdr, 377 Lisp_Object args[2];
378 EQ (frame, Qt) ? Vbuffer_alist : 378 args[0] = Qcdr;
379 decode_frame (frame)->buffer_alist); 379 args[1] = EQ (frame, Qt) ?
380 Vbuffer_alist : decode_frame (frame)->buffer_alist;
381 return FmapcarX (countof (args), args);
380 } 382 }
381 383
382 Lisp_Object 384 Lisp_Object
383 get_buffer (Lisp_Object name, int error_if_deleted_or_does_not_exist) 385 get_buffer (Lisp_Object name, int error_if_deleted_or_does_not_exist)
384 { 386 {