mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

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

Browse Source 
* lisp/minibuffer.el (completion-at-point): Remove the `arg'.
This commit is contained in:
Stefan Monnier 2010-12-06 16:06:02 -05:00
parent 88b5a757a2
commit 67027b4979
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/NEWS
View File

@ -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.

10
lisp/bindings.el
View File

@ -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)

40
lisp/minibuffer.el
View File

@ -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.