From a73a57bca1820e6c723601798e4f83f0b97680a9 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Wed, 23 Sep 1998 21:56:59 +0000 Subject: [PATCH] (dabbrev--find-expansion): Don't scan the current buffer over again. --- lisp/dabbrev.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 11da3b68e75..371037312e2 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -768,14 +768,16 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." (append dabbrev--friend-buffer-list non-friend-buffer-list))))) ;; Move buffers that are visible on the screen - ;; to the front of the list. - (if dabbrev--friend-buffer-list - (let ((w (next-window (selected-window)))) - (while (not (eq w (selected-window))) - (setq dabbrev--friend-buffer-list - (cons (window-buffer w) - (delq (window-buffer w) dabbrev--friend-buffer-list))) - (setq w (next-window w))))) + ;; to the front of the list. Remove the current buffer. + (when dabbrev--friend-buffer-list + (let ((w (next-window (selected-window)))) + (while (not (eq w (selected-window))) + (setq dabbrev--friend-buffer-list + (cons (window-buffer w) + (delq (window-buffer w) dabbrev--friend-buffer-list))) + (setq w (next-window w)))) + (setq dabbrev--friend-buffer-list + (delq (current-buffer) dabbrev--friend-buffer-list))) ;; Walk through the buffers (while (and (not expansion) dabbrev--friend-buffer-list) (setq dabbrev--last-buffer -- 2.39.2