From 08460cd4fb8890f5f797b10281afc4b3d8ee71db Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 26 Jun 1997 21:09:22 +0000 Subject: [PATCH] (Fbuffer_list): New optional argument FRAME. --- src/buffer.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index e220981243..baa7f6104d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -39,6 +39,7 @@ Boston, MA 02111-1307, USA. */ #include "region-cache.h" #include "indent.h" #include "blockinput.h" +#include "frame.h" struct buffer *current_buffer; /* the current buffer */ @@ -179,11 +180,34 @@ Value is nil if OBJECT is not a buffer or if it has been killed.") ? Qt : Qnil); } -DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 0, 0, - "Return a list of all existing live buffers.") - () +DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0, + "Return a list of all existing live buffers.\n\ +If the optional arg FRAME is a frame, we return that frame's buffer list.") + (frame) + Lisp_Object frame; { - return Fmapcar (Qcdr, Vbuffer_alist); + Lisp_Object framelist, general; + general = Fmapcar (Qcdr, Vbuffer_alist); + + if (FRAMEP (frame)) + { + Lisp_Object tail; + + CHECK_FRAME (frame, 1); + + framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); + + /* Remove from GENERAL any buffer that duplicates one in FRAMELIST. */ + tail = framelist; + while (! NILP (tail)) + { + general = Fdelq (XCONS (tail)->car, general); + tail = XCONS (tail)->cdr; + } + return nconc2 (framelist, general); + } + + return general; } /* Like Fassoc, but use Fstring_equal to compare -- 2.39.2