Mercurial > emacs
changeset 73078:4bf12abbb384
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.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 23 Sep 2006 18:39:22 +0000 |
parents | c5f24d028db0 |
children | b2a5b94a29c7 |
files | lisp/ChangeLog lisp/icomplete.el |
diffstat | 2 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 23 18:30:44 2006 +0000 +++ b/lisp/ChangeLog Sat Sep 23 18:39:22 2006 +0000 @@ -1,3 +1,12 @@ +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. + 2006-09-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * frame.el (focus-follows-mouse): Set default to nil on Mac.
--- a/lisp/icomplete.el Sat Sep 23 18:30:44 2006 +0000 +++ b/lisp/icomplete.el Sat Sep 23 18:39:22 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-for-completion-tables)))) ;;;_ > icomplete-minibuffer-setup () (defun icomplete-minibuffer-setup () @@ -326,6 +333,7 @@ ;;;_* Local emacs vars. ;;;Local variables: ;;;allout-layout: (-2 :) +;;;allout-widgets-mode-inhibit: t ;;;End: ;; arch-tag: 339ec25a-0741-4eb6-be63-997532e89b0f