Mercurial > emacs
diff lisp/icomplete.el @ 90609:bb0e318b7c53
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 447-459)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 141-144)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 03 Oct 2006 05:04:21 +0000 |
| parents | d1c5430c5bff 9566558723f8 |
| children | f1d13e615070 |
line wrap: on
line diff
--- a/lisp/icomplete.el Mon Oct 02 08:05:25 2006 +0000 +++ b/lisp/icomplete.el Tue Oct 03 05:04:21 2006 +0000 @@ -157,6 +157,12 @@ (< (length x) (length y)))) ", ") ">")))))) +;;;_ = icomplete-with-completion-tables +(defvar icomplete-with-completion-tables '(internal-complete-buffer) + "Specialized completion tables with which icomplete should operate. + +Icomplete does not operate with any specialized completion tables +except those on this list.") ;;;_ > icomplete-mode (&optional prefix) ;;;###autoload @@ -184,8 +190,9 @@ (and (window-minibuffer-p (selected-window)) (not executing-kbd-macro) minibuffer-completion-table - ;; (or minibuffer-completing-file-name - (not (functionp minibuffer-completion-table)))) ;; ) + (or (not (functionp minibuffer-completion-table)) + (member minibuffer-completion-table + icomplete-with-completion-tables)))) ;;;_ > icomplete-minibuffer-setup () (defun icomplete-minibuffer-setup ()