Commit 67027b49 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/bindings.el (complete-symbol): Move back from minibuffer.el.

* lisp/minibuffer.el (completion-at-point): Remove the `arg'.
parent 88b5a757
......@@ -228,7 +228,7 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
+++
** There is a new command `count-words-region', which does what you expect.
** completion-at-point is now an alias for complete-symbol.
** completion-at-point now handles tags and semantic completion.
** The default value of `backup-by-copying-when-mismatch' is now t.
......
......@@ -655,6 +655,16 @@ is okay. See `mode-line-format'.")
(define-key esc-map "\t" 'complete-symbol)
(defun complete-symbol (arg)
"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) (completion-at-point)))
;; Reduce total amount of space we must allocate during this function
;; that we will not need to keep permanently.
(garbage-collect)
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment