diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/obsolete/sym-comp.el | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41b53a0c375..edc28fcd5b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-05-31 Glenn Morris <rgm@gnu.org> + * 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 <dgutov@yandex.ru> diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el index 4641ca68544..bd049b85aa2 100644 --- a/lisp/obsolete/sym-comp.el +++ b/lisp/obsolete/sym-comp.el @@ -139,12 +139,13 @@ to be set buffer-locally. Variables `symbol-completion-symbol-function', 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))) |