diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-08 14:47:07 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-08 14:47:07 -0400 |
| commit | 0235128c15aabd21b37e7a359b4932709471f156 (patch) | |
| tree | 4f32e3a638c4e3d6e7d9c232b3e0b4b939368f54 /lisp/emacs-lisp/lisp.el | |
| parent | ca63fca5b669d42d8c131a1f33446d9a9d7795f6 (diff) | |
| parent | 19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff) | |
| download | emacs-0235128c15aabd21b37e7a359b4932709471f156.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 6e209156b92..4ef6dab8968 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -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 |