diff options
| author | Karl Heuer | 1998-09-23 21:56:59 +0000 |
|---|---|---|
| committer | Karl Heuer | 1998-09-23 21:56:59 +0000 |
| commit | a73a57bca1820e6c723601798e4f83f0b97680a9 (patch) | |
| tree | 6080e725af14a7de41314f64cfb0d3dc45ef8e76 | |
| parent | 0cf950b1a93ba7d22628af2829156c328a0fa1c0 (diff) | |
| download | emacs-a73a57bca1820e6c723601798e4f83f0b97680a9.tar.gz emacs-a73a57bca1820e6c723601798e4f83f0b97680a9.zip | |
(dabbrev--find-expansion): Don't scan the current buffer
over again.
| -rw-r--r-- | lisp/dabbrev.el | 18 |
1 files 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]." | |||
| 768 | (append dabbrev--friend-buffer-list | 768 | (append dabbrev--friend-buffer-list |
| 769 | non-friend-buffer-list))))) | 769 | non-friend-buffer-list))))) |
| 770 | ;; Move buffers that are visible on the screen | 770 | ;; Move buffers that are visible on the screen |
| 771 | ;; to the front of the list. | 771 | ;; to the front of the list. Remove the current buffer. |
| 772 | (if dabbrev--friend-buffer-list | 772 | (when dabbrev--friend-buffer-list |
| 773 | (let ((w (next-window (selected-window)))) | 773 | (let ((w (next-window (selected-window)))) |
| 774 | (while (not (eq w (selected-window))) | 774 | (while (not (eq w (selected-window))) |
| 775 | (setq dabbrev--friend-buffer-list | 775 | (setq dabbrev--friend-buffer-list |
| 776 | (cons (window-buffer w) | 776 | (cons (window-buffer w) |
| 777 | (delq (window-buffer w) dabbrev--friend-buffer-list))) | 777 | (delq (window-buffer w) dabbrev--friend-buffer-list))) |
| 778 | (setq w (next-window w))))) | 778 | (setq w (next-window w)))) |
| 779 | (setq dabbrev--friend-buffer-list | ||
| 780 | (delq (current-buffer) dabbrev--friend-buffer-list))) | ||
| 779 | ;; Walk through the buffers | 781 | ;; Walk through the buffers |
| 780 | (while (and (not expansion) dabbrev--friend-buffer-list) | 782 | (while (and (not expansion) dabbrev--friend-buffer-list) |
| 781 | (setq dabbrev--last-buffer | 783 | (setq dabbrev--last-buffer |