1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00

* sym-comp.el (symbol-complete): Replace obsolete completion-annotate-function.

This commit is contained in:
Glenn Morris 2013-05-31 00:34:56 -07:00
parent ac699eef91
commit e26aac1f93
2 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,8 @@
2013-05-31 Glenn Morris <rgm@gnu.org> 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. * progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler.
2013-05-31 Dmitry Gutov <dgutov@yandex.ru> 2013-05-31 Dmitry Gutov <dgutov@yandex.ru>

View File

@ -139,12 +139,13 @@ to be set buffer-locally. Variables `symbol-completion-symbol-function',
pattern)) pattern))
;; In case the transform needs to access it. ;; In case the transform needs to access it.
(symbol-completion-predicate predicate) (symbol-completion-predicate predicate)
(completion-annotate-function (completion-extra-properties
(if (functionp symbol-completion-transform-function) (if (functionp symbol-completion-transform-function)
'(:annotation-function
(lambda (str) (lambda (str)
(car-safe (cdr-safe (car-safe (cdr-safe
(funcall symbol-completion-transform-function (funcall symbol-completion-transform-function
str))))))) str))))))))
(completion-in-region (- (point) (length pattern)) (point) (completion-in-region (- (point) (length pattern)) (point)
completions predicate))) completions predicate)))