Mercurial > emacs
changeset 97474:b7077a582a3d
(lisp-complete-symbol): Supply match-size to display-completion-list.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 14 Aug 2008 23:44:14 +0000 |
| parents | dbb95d0d31c2 |
| children | 2ac804a70140 |
| files | lisp/emacs-lisp/lisp.el |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp.el Thu Aug 14 23:43:53 2008 +0000 +++ b/lisp/emacs-lisp/lisp.el Thu Aug 14 23:44:14 2008 +0000 @@ -687,18 +687,19 @@ (message "Making completion list...")) (let ((list (all-completions pattern obarray predicate))) (setq list (sort list 'string<)) - (or (eq predicate 'fboundp) - (let (new) - (while list - (setq new (cons (if (fboundp (intern (car list))) - (list (car list) " <f>") - (car list)) - new)) - (setq list (cdr list))) - (setq list (nreverse new)))) + (unless (eq predicate 'fboundp) + (let (new) + (dolist (compl list) + (push (if (fboundp (intern compl)) + (list compl " <f>") + compl) + new)) + (setq list (nreverse new)))) (if (> (length list) 1) (with-output-to-temp-buffer "*Completions*" - (display-completion-list list pattern)) + (display-completion-list + list pattern + (- beg (field-beginning)))) ;; Don't leave around a completions buffer that's ;; out of date. (let ((win (get-buffer-window "*Completions*" 0)))