[Emacs-diffs] /srv/bzr/emacs/trunk r112799: * sym-comp.el (symbol-complete): Replace obsolete completion-annotate-function.

[Glenn Morris]

------------------------------------------------------------
revno: 112799
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-31 00:34:56 -0700
message:
  * sym-comp.el (symbol-complete): Replace obsolete 
completion-annotate-function.
modified:
  lisp/ChangeLog
  lisp/obsolete/sym-comp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-31 07:05:55 +0000
+++ b/lisp/ChangeLog    2013-05-31 07:34:56 +0000
@@ -1,5 +1,8 @@
 2013-05-31  Glenn Morris  <address@hidden>
 
+       * obsolete/sym-comp.el (symbol-complete):
+       Replace obsolete completion-annotate-function.
+
        * progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler.
 
 2013-05-31  Dmitry Gutov  <address@hidden>

=== modified file 'lisp/obsolete/sym-comp.el'
--- a/lisp/obsolete/sym-comp.el 2013-05-24 03:45:50 +0000
+++ b/lisp/obsolete/sym-comp.el 2013-05-31 07:34:56 +0000
@@ -139,12 +139,13 @@
                                pattern))
          ;; In case the transform needs to access it.
          (symbol-completion-predicate predicate)
-         (completion-annotate-function
+         (completion-extra-properties
           (if (functionp symbol-completion-transform-function)
-              (lambda (str)
-                (car-safe (cdr-safe
-                           (funcall symbol-completion-transform-function
-                                    str)))))))
+              '(:annotation-function
+                (lambda (str)
+                  (car-safe (cdr-safe
+                             (funcall symbol-completion-transform-function
+                                      str))))))))
     (completion-in-region (- (point) (length pattern)) (point)
                           completions predicate)))