diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-05-27 23:10:32 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-05-27 23:10:32 -0300 |
| commit | 0ff8e1ba6b4819aca0c95e15e2255908e3d276d3 (patch) | |
| tree | b62dc69878bddd314c98a718d81edbb9c29cc05d /lisp/info-look.el | |
| parent | 423428a80c423a32727ad1e01442b020835fb92b (diff) | |
| download | emacs-0ff8e1ba6b4819aca0c95e15e2255908e3d276d3.tar.gz | |
* lisp/minibuffer.el (completion--capf-wrapper): Check applicability before
retuning non-nil for non-exclusive completion data.
* lisp/progmodes/etags.el (tags-completion-at-point-function):
* lisp/info-look.el (info-lookup-completions-at-point): Mark as non-exclusive.
(info-complete): Adjust accordingly.
* lisp/erc/erc-pcomplete.el (erc-pcompletions-at-point): Mark the completion
data as non-exclusive if it's using the default-completion-function.
(pcomplete-erc-parse-arguments): Rename pcomplete-parse-erc-arguments.
(pcomplete-erc-setup): Use new name.
Diffstat (limited to 'lisp/info-look.el')
| -rw-r--r-- | lisp/info-look.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/info-look.el b/lisp/info-look.el index 26a89ca956e..2cfaa81d4c7 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -667,7 +667,8 @@ Return nil if there is nothing appropriate in the buffer near point." (end-of-line) (while (and (search-backward try nil t) (< start (point)))) - (list (match-beginning 0) (match-end 0) completions)))))))) + (list (match-beginning 0) (match-end 0) completions + :exclusive 'no)))))))) (defun info-complete (topic mode) "Try to complete a help item." @@ -675,7 +676,7 @@ Return nil if there is nothing appropriate in the buffer near point." (let ((data (info-lookup-completions-at-point topic mode))) (if (null data) (error "No %s completion available for `%s' at point" topic mode) - (apply #'completion-in-region data)))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data))))) ;;; Initialize some common modes. |