Mercurial > emacs
changeset 35570:4308e62b25c8
(iswitchb-make-buflist): When nconc'ing lists, don't
discard the result.
(iswitchb-to-end): Likewise.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 25 Jan 2001 17:10:48 +0000 |
| parents | 5cd8ebba5a94 |
| children | 1c6d1e65f2b3 |
| files | lisp/iswitchb.el |
| diffstat | 1 files changed, 17 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/iswitchb.el Thu Jan 25 16:36:48 2001 +0000 +++ b/lisp/iswitchb.el Thu Jan 25 17:10:48 2001 +0000 @@ -1,6 +1,6 @@ ;;; iswitchb.el --- switch between buffers using substrings -;; Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@anc.ed.ac.uk> ;; Maintainer: Stephen Eglen <stephen@anc.ed.ac.uk> @@ -741,21 +741,22 @@ it is put to the start of the list." (setq iswitchb-buflist (let* ((iswitchb-current-buffers (iswitchb-get-buffers-in-frames)) - (iswitchb-temp-buflist - (delq nil - (mapcar - (lambda (x) - (let ((b-name (buffer-name x))) - (if (not - (or - (iswitchb-ignore-buffername-p b-name) - (memq b-name iswitchb-current-buffers))) - b-name))) - (buffer-list (and iswitchb-use-frame-buffer-list - (selected-frame))))))) - (nconc iswitchb-temp-buflist iswitchb-current-buffers) + (iswitchb-temp-buflist + (delq nil + (mapcar + (lambda (x) + (let ((b-name (buffer-name x))) + (if (not + (or + (iswitchb-ignore-buffername-p b-name) + (memq b-name iswitchb-current-buffers))) + b-name))) + (buffer-list (and iswitchb-use-frame-buffer-list + (selected-frame))))))) + (setq iswitchb-temp-buflist + (nconc iswitchb-temp-buflist iswitchb-current-buffers)) (run-hooks 'iswitchb-make-buflist-hook) - ;; Should this be after the hooks, or should the hooks be the + ;; Should this be after the hooks, or should the hooks be the ;; final thing to be run? (if default (progn @@ -771,7 +772,7 @@ (lambda (elem) (setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist))) lst) - (nconc iswitchb-temp-buflist lst)) + (setq iswitchb-temp-buflist (nconc iswitchb-temp-buflist lst))) (defun iswitchb-get-buffers-in-frames (&optional current) "Return the list of buffers that are visible in the current frame.