From a185548b1cd687da0f31c0556c003e7a544b35d7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 19 Nov 2009 03:12:51 +0000 Subject: * abbrev.el (abbrev-with-wrapper-hook): (re)move... * simple.el (with-wrapper-hook): ...to here. Add argument `args'. * minibuffer.el (completion-in-region-functions): New hook. (completion-in-region): New function. * emacs-lisp/lisp.el (lisp-complete-symbol): * pcomplete.el (pcomplete-std-complete): Use it. --- lisp/emacs-lisp/lisp.el | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'lisp/emacs-lisp/lisp.el') diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 9b48c497eba..0edd6556dbf 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -647,17 +647,11 @@ considered." ;; Maybe a `let' varlist or something. nil ;; Else, we assume that a function name is expected. - 'fboundp))))) - (ol (make-overlay beg end nil nil t))) - (overlay-put ol 'field 'completion) + 'fboundp)))))) (let ((completion-annotate-function (unless (eq predicate 'fboundp) - (lambda (str) (if (fboundp (intern-soft str)) " ")))) - (minibuffer-completion-table obarray) - (minibuffer-completion-predicate predicate)) - (unwind-protect - (call-interactively 'minibuffer-complete) - (delete-overlay ol))))) + (lambda (str) (if (fboundp (intern-soft str)) " "))))) + (completion-in-region beg end obarray predicate)))) ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e ;;; lisp.el ends here -- cgit v1.2.3