diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-19 03:12:51 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-19 03:12:51 +0000 |
| commit | a185548b1cd687da0f31c0556c003e7a544b35d7 (patch) | |
| tree | ac50feb064aef7c1dd14729fc9980e797473f51a /lisp/emacs-lisp/lisp.el | |
| parent | 87e32266f0fc8467bc8280c9b73b7c5ab9d5f951 (diff) | |
| download | emacs-a185548b1cd687da0f31c0556c003e7a544b35d7.tar.gz | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 12 |
1 files changed, 3 insertions, 9 deletions
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)) " <f>")))) - (minibuffer-completion-table obarray) - (minibuffer-completion-predicate predicate)) - (unwind-protect - (call-interactively 'minibuffer-complete) - (delete-overlay ol))))) + (lambda (str) (if (fboundp (intern-soft str)) " <f>"))))) + (completion-in-region beg end obarray predicate)))) ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e ;;; lisp.el ends here |