aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-08-09 02:51:55 +0000
committerRichard M. Stallman2005-08-09 02:51:55 +0000
commit9a84ddd8b5e7d6c646a8defd9b3a54a83e9ca76e (patch)
treeb1f3f69d56251bfb7bec013ed10c6910335c2170
parent83047ee3fe97982bba066d6123a21b41e35edde0 (diff)
downloademacs-9a84ddd8b5e7d6c646a8defd9b3a54a83e9ca76e.tar.gz
emacs-9a84ddd8b5e7d6c646a8defd9b3a54a83e9ca76e.zip
(icomplete-exhibit): Adapt to new while-no-input calling convention.
-rw-r--r--lisp/icomplete.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index bbfb817064d..085c111d856 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -243,13 +243,15 @@ and `minibuffer-setup-hook'."
243 ;; embarking on computing completions: 243 ;; embarking on computing completions:
244 (sit-for icomplete-compute-delay))) 244 (sit-for icomplete-compute-delay)))
245 (let ((text (while-no-input 245 (let ((text (while-no-input
246 (icomplete-completions 246 (list
247 (field-string) 247 (icomplete-completions
248 minibuffer-completion-table 248 (field-string)
249 minibuffer-completion-predicate 249 minibuffer-completion-table
250 (not minibuffer-completion-confirm)))) 250 minibuffer-completion-predicate
251 (not minibuffer-completion-confirm)))))
251 (buffer-undo-list t)) 252 (buffer-undo-list t))
252 (if text (insert text))))))) 253 ;; Do nothing if while-no-input was aborted.
254 (if (consp text) (insert (car text))))))))
253 255
254;;;_ > icomplete-completions (name candidates predicate require-match) 256;;;_ > icomplete-completions (name candidates predicate require-match)
255(defun icomplete-completions (name candidates predicate require-match) 257(defun icomplete-completions (name candidates predicate require-match)