diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2006-09-23 18:39:22 +0000 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2006-09-23 18:39:22 +0000 |
commit | 183ebe5bde402d66d0f6f1cd7ef70a3f21828d53 (patch) | |
tree | dfb809dd80d27ff57c1b3bcabf9ce06d747a5acb /lisp/icomplete.el | |
parent | 771582f8037047b5dc14255eda1e4d124b719f78 (diff) | |
download | emacs-183ebe5bde402d66d0f6f1cd7ef70a3f21828d53.tar.gz |
2006-09-23 Ken Manheimer <ken.manheimer@gmail.com>
* icomplete.el (icomplete-with-completion-tables): List of
specialized completion tables with which icomplete should
operate. Include the new `internal-complete-buffer', so icomplete
works with interactive buffer-selection.
(icomplete-simple-completing-p): Add acceptance of specialized
completion tables listed in icomplete-with-completion-tables.
Diffstat (limited to 'lisp/icomplete.el')
-rw-r--r-- | lisp/icomplete.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el index f53ef7c91d1..5d1d6eb37a9 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -157,6 +157,12 @@ is minibuffer." (< (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 @@ Conditions are: (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-for-completion-tables)))) ;;;_ > icomplete-minibuffer-setup () (defun icomplete-minibuffer-setup () @@ -326,6 +333,7 @@ are exhibited within the square braces.)" ;;;_* Local emacs vars. ;;;Local variables: ;;;allout-layout: (-2 :) +;;;allout-widgets-mode-inhibit: t ;;;End: ;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f |