procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-23

Browse source
This commit is contained in:
Stefan Monnier 2010-05-08 14:47:07 -04:00
commit 0235128c15
68 changed files with 1155 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/lisp.el
View file

@ -628,11 +628,12 @@ considered."
(minibuffer-message "Nothing to complete")
(let ((completion-annotate-function
(plist-get plist :annotate-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate))))))
(defun lisp-completion-at-point (&optional predicate)
"Function used for `completion-at-point-functions' in `emacs-lisp-mode'."
;; FIXME: the `end' could be after point?
(let* ((pos (point))
(beg (with-syntax-table emacs-lisp-mode-syntax-table