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/pcomplete.el | |
| parent | 87e32266f0fc8467bc8280c9b73b7c5ab9d5f951 (diff) | |
| download | emacs-a185548b1cd687da0f31c0556c003e7a544b35d7.tar.gz emacs-a185548b1cd687da0f31c0556c003e7a544b35d7.tar.bz2 emacs-a185548b1cd687da0f31c0556c003e7a544b35d7.zip | |
* 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/pcomplete.el')
| -rw-r--r-- | lisp/pcomplete.el | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 65b48f49fa9..387aa106a43 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -513,22 +513,18 @@ Same as `pcomplete' but using the standard completion UI." (directory-file-name f)) pcomplete-seen)))))) - (let ((ol (make-overlay beg (point) nil nil t)) - (minibuffer-completion-table - ;; Add a space at the end of completion. Use a terminator-regexp - ;; that never matches since the terminator cannot appear - ;; within the completion field anyway. - (if (zerop (length pcomplete-termination-string)) - table - (apply-partially 'completion-table-with-terminator - (cons pcomplete-termination-string - "\\`a\\`") - table))) - (minibuffer-completion-predicate pred)) - (overlay-put ol 'field 'pcomplete) - (unwind-protect - (call-interactively 'minibuffer-complete) - (delete-overlay ol)))))) + (completion-in-region + beg (point) + ;; Add a space at the end of completion. Use a terminator-regexp + ;; that never matches since the terminator cannot appear + ;; within the completion field anyway. + (if (zerop (length pcomplete-termination-string)) + table + (apply-partially 'completion-table-with-terminator + (cons pcomplete-termination-string + "\\`a\\`") + table)) + pred)))) ;;; Pcomplete's native UI. |