From 397e713bc5360c1b807bd8874b2f356572cba8eb Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 23 Sep 2006 18:39:22 +0000 Subject: [PATCH] 2006-09-23 Ken Manheimer * 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. --- lisp/ChangeLog | 9 +++++++++ lisp/icomplete.el | 12 ++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae7325d6a92..f279fe624fc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2006-09-23 Ken Manheimer + + * 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 * frame.el (focus-follows-mouse): Set default to nil on Mac. 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 -- 2.39.2