diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-06 16:06:02 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-06 16:06:02 -0500 |
| commit | 67027b49796eec01dccf1e14d7b0497b2d484328 (patch) | |
| tree | b38a77d75e4caa35f7045690da750857a4eb4b6b /lisp/minibuffer.el | |
| parent | 88b5a757a2ea698831c61bb10abc9c0abab7d31c (diff) | |
| download | emacs-67027b49796eec01dccf1e14d7b0497b2d484328.tar.gz | |
* lisp/bindings.el (complete-symbol): Move back from minibuffer.el.
* lisp/minibuffer.el (completion-at-point): Remove the `arg'.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 78580c86e45..8d09d5d3f6d 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1251,31 +1251,23 @@ Currently supported properties are: `:predicate' a predicate that completion candidates need to satisfy. `:annotation-function' the value to use for `completion-annotate-function'.") -(defun completion-at-point (&optional arg) +(defun completion-at-point () "Perform completion on the text around point. -The completion method is determined by `completion-at-point-functions'. - -With a prefix argument, this command does completion within -the collection of symbols listed in the index of the manual for the -language you are using." - (interactive "P") - (if arg - (info-complete-symbol) - (let ((res (run-hook-with-args-until-success - 'completion-at-point-functions))) - (cond - ((functionp res) (funcall res)) - (res - (let* ((plist (nthcdr 3 res)) - (start (nth 0 res)) - (end (nth 1 res)) - (completion-annotate-function - (or (plist-get plist :annotation-function) - completion-annotate-function))) - (completion-in-region start end (nth 2 res) - (plist-get plist :predicate)))))))) - -(define-obsolete-function-alias 'complete-symbol 'completion-at-point "24.1") +The completion method is determined by `completion-at-point-functions'." + (interactive) + (let ((res (run-hook-with-args-until-success + 'completion-at-point-functions))) + (cond + ((functionp res) (funcall res)) + (res + (let* ((plist (nthcdr 3 res)) + (start (nth 0 res)) + (end (nth 1 res)) + (completion-annotate-function + (or (plist-get plist :annotation-function) + completion-annotate-function))) + (completion-in-region start end (nth 2 res) + (plist-get plist :predicate))))))) ;;; Key bindings. |