diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-12 00:07:06 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-12 00:07:06 -0700 |
| commit | d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68 (patch) | |
| tree | e6d877c35b4396bd5092a7be244b1527374d4a0e /lisp/emacs-lisp | |
| parent | d45885f7e0025fb5bd0756ba78c511a981d64533 (diff) | |
| parent | e531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff) | |
| download | emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.tar.gz emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.tar.bz2 emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.zip | |
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index deb06f52549..ef0c49b8616 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -636,8 +636,8 @@ considered." (plist (nthcdr 3 data))) (if (null data) (minibuffer-message "Nothing to complete") - (let ((completion-annotate-function - (plist-get plist :annotate-function))) + (let ((completion-annotate-function + (plist-get plist :annotation-function))) (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get plist :predicate)))))) @@ -685,7 +685,7 @@ considered." (when end (list beg end obarray :predicate predicate - :annotate-function + :annotation-function (unless (eq predicate 'fboundp) (lambda (str) (if (fboundp (intern-soft str)) " <f>")))))))) |