diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-08-14 23:44:14 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-08-14 23:44:14 +0000 |
| commit | d478606111f9779a8745c3982e65acfb2cc50315 (patch) | |
| tree | e5459f629bbcc3a45e15369cf6f13c9c05e5c5a8 /lisp/emacs-lisp | |
| parent | 42e2427ae3384ec03306498ec2a68a889b452ad0 (diff) | |
| download | emacs-d478606111f9779a8745c3982e65acfb2cc50315.tar.gz emacs-d478606111f9779a8745c3982e65acfb2cc50315.tar.bz2 emacs-d478606111f9779a8745c3982e65acfb2cc50315.zip | |
(lisp-complete-symbol): Supply match-size to display-completion-list.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index da1b53cc06e..80bffb33638 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -687,18 +687,19 @@ considered." (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))) |