summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/cedet/ChangeLog3
-rw-r--r--lisp/cedet/semantic/grammar.el5
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index d4be88e5e27..2c4adf4c0a6 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,5 +1,8 @@
2013-06-01 Glenn Morris <rgm@gnu.org>
+ * semantic/grammar.el (semantic-grammar-complete):
+ Replace the obsolete function lisp-complete-symbol.
+
* semantic/analyze/fcn.el (semantic-tag-similar-p): Autoload.
* srecode/args.el, srecode/java.el: Require ede.
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 2d53c857c1e..ce658cd5d54 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1484,7 +1484,10 @@ expression then Lisp symbols are completed."
(interactive)
(if (semantic-grammar-in-lisp-p)
;; We are in lisp code. Do lisp completion.
- (lisp-complete-symbol)
+ (let ((completion-at-point-functions
+ (append '(lisp-completion-at-point)
+ completion-at-point-functions)))
+ (completion-at-point))
;; We are not in lisp code. Do rule completion.
(let* ((nonterms (semantic-find-tags-by-class 'nonterminal (current-buffer)))
(sym (car (semantic-ctxt-current-symbol)))