From cfabd09347702b319551f8aacb7df317c17d8eeb Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 18 Jul 2002 14:58:53 +0000 Subject: [PATCH] (last-buffer): Handle buffer-list and buffer-predicate frame parameters like bury-buffer. --- lisp/bindings.el | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lisp/bindings.el b/lisp/bindings.el index e4109007953..ab606fa9cc4 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -275,10 +275,26 @@ Keymap for what is displayed by `mode-line-buffer-identification'.") (defun last-buffer () "\ Return the last non-hidden buffer in the buffer list." - (let ((list (reverse (buffer-list)))) - (while (eq (aref (buffer-name (car list)) 0) ? ) - (setq list (cdr list))) - (car list))) + ;; This logic is more or less copied from bury-buffer, + ;; except that we reverse the buffer list. + (let ((fbl (frame-parameter 'buffer-list)) + (list (buffer-list)) + (pred (frame-parameter nil 'buffer-predicate)) + found notsogood) + ;; Merge the frame buffer list with the whole buffer list, + ;; and reverse it. + (dolist (buffer fbl) + (setq list (delq buffer list))) + (setq list (nreverse (append fbl list))) + (while (not found) + (unless (or (eq (aref (buffer-name (car list)) 0) ? ) + ;; If the selected frame has a buffer_predicate, + ;; disregard buffers that don't fit the predicate. + (and pred (not (funcall pred (car list))))) + (if (get-buffer-window (car list) 'visible) + (unless notsogood (setq notsogood (car list))) + (setq found (car list))))) + (or found notsogood))) (defun unbury-buffer () "\ Switch to the last buffer in the buffer list." -- 2.39.5