Mercurial > emacs
changeset 53258:f94a302ee4c0
(PC-is-complete-p): delete.
(PC-do-completion): Replace all calls to `PC-is-complete-p' with calls
to `test-completion'.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Tue, 23 Dec 2003 23:42:28 +0000 |
| parents | 869dfa7b9022 |
| children | ee40f6db9683 |
| files | lisp/complete.el |
| diffstat | 1 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/complete.el Tue Dec 23 23:41:03 2003 +0000 +++ b/lisp/complete.el Tue Dec 23 23:42:28 2003 +0000 @@ -368,7 +368,7 @@ ;; Check if buffer contents can already be considered complete (if (and (eq mode 'exit) - (PC-is-complete-p str table pred)) + (test-completion str table pred)) 'complete ;; Do substitutions in directory names @@ -641,7 +641,7 @@ (if improved ;; We changed it... would it be complete without the space? - (if (PC-is-complete-p (buffer-substring 1 (1- end)) + (if (test-completion (buffer-substring 1 (1- end)) table pred) (delete-region (1- end) end))) @@ -649,7 +649,7 @@ ;; We changed it... enough to be complete? (and (eq mode 'exit) - (PC-is-complete-p (field-string) table pred)) + (test-completion (field-string) table pred)) ;; If totally ambiguous, display a list of completions (if (or (eq completion-auto-help t) @@ -680,20 +680,6 @@ (car poss))))) t))))) - -(defun PC-is-complete-p (str table pred) - (let ((res (if (listp table) - (assoc str table) - (if (vectorp table) - (or (equal str "nil") ; heh, heh, heh - (intern-soft str table)) - (funcall table str pred 'lambda))))) - (and res - (or (not pred) - (and (not (listp table)) (not (vectorp table))) - (funcall pred res)) - res))) - (defun PC-chop-word (new old) (let ((i -1) (j -1))