mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 09:00:31 -08:00
Code Issues Projects Releases Wiki Activity

(lisp-complete-symbol): Regenerate the completion list, even after a partial

Browse source 
completion has been inserted in the current buffer.  If there are more than 1
completion, redisplay the *Completions* buffer; if the completion is unique,
delete the *Completions* window.
This commit is contained in:
Eli Zaretskii 2005-12-10 11:40:04 +00:00
parent eba9bb5f1a
commit 6d93e4aa38
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2005-12-10 Kevin Rodgers <ihs_4664@ihs.com>
* emacs-lisp/lisp.el (lisp-complete-symbol): Regenerate the
completion list, even after a partial completion has been
inserted in the current buffer. If there are more than 1
completion, redisplay the *Completions* buffer; if the
completion is unique, delete the *Completions* window.
2005-12-10 Eli Zaretskii <eliz@gnu.org> 2005-12-10 Eli Zaretskii <eliz@gnu.org>
* mail/rmail.el (rmail-next-same-subject): Handle multiple "Re: " * mail/rmail.el (rmail-next-same-subject): Handle multiple "Re: "

13
lisp/emacs-lisp/lisp.el
View file

@ -569,10 +569,11 @@ considered."
((null completion) ((null completion)
(message "Can't find completion for \"%s\"" pattern) (message "Can't find completion for \"%s\"" pattern)
(ding)) (ding))
((not (string= pattern completion))
(delete-region beg end)
(insert completion))
(t (t
(unless (string= completion pattern)
(delete-region beg end)
(insert completion)
(setq pattern completion))
(message "Making completion list...") (message "Making completion list...")
(let ((list (all-completions pattern obarray predicate))) (let ((list (all-completions pattern obarray predicate)))
(setq list (sort list 'string<)) (setq list (sort list 'string<))
@ -585,8 +586,10 @@ considered."
new)) new))
(setq list (cdr list))) (setq list (cdr list)))
(setq list (nreverse new)))) (setq list (nreverse new))))
(with-output-to-temp-buffer "*Completions*" (if (> (length list) 1)
(display-completion-list list pattern))) (with-output-to-temp-buffer "*Completions*"
(display-completion-list list pattern))
(delete-windows-on "*Completions*")))
(message "Making completion list...%s" "done"))))))) (message "Making completion list...%s" "done")))))))
;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e ;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e