Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

[gnu-emacs] / lisp / emacs-lisp / lisp.el

diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index deb06f5254953ffbd71c4de2796370a3d606e681..ef0c49b86163bd85a84d35ac26856181a3865357 100644 (file)
--- 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>"))))))))