* minibuffer.el (tags-completion-at-point-function): New function.

(completion-at-point-functions): Use it.

* cedet/semantic.el (semantic-completion-at-point-function): New function.
(semantic-mode): Use semantic-completion-at-point-function for
completion-at-point-functions instead.

* progmodes/etags.el (complete-tag): Revert last change.

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 8df4feaa2bb..99e594a4638 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1083,7 +1083,8 @@ Semantic mode.
         ;; Add semantic-ia-complete-symbol to
         ;; completion-at-point-functions, so that it is run from
         ;; M-TAB.
-        (add-hook 'completion-at-point-functions 'semantic-ia-complete-symbol)
+        (add-hook 'completion-at-point-functions
+                  'semantic-completion-at-point-function)
         (if global-ede-mode
             (define-key cedet-menu-map [cedet-menu-separator] '("--")))
         (dolist (b (buffer-list))
@@ -1091,7 +1092,8 @@ Semantic mode.
             (semantic-new-buffer-fcn))))
     ;; Disable all Semantic features.
     (remove-hook 'mode-local-init-hook 'semantic-new-buffer-fcn)
-    (remove-hook 'completion-at-point-functions 'semantic-ia-complete-symbol)
+    (remove-hook 'completion-at-point-functions
+                 'semantic-completion-at-point-function)
     (define-key cedet-menu-map [cedet-menu-separator] nil)
     (define-key cedet-menu-map [semantic-options-separator] nil)
     ;; FIXME: handle semanticdb-load-ebrowse-caches
@@ -1099,6 +1101,9 @@ Semantic mode.
       (if (and (boundp mode) (eval mode))
           (funcall mode -1)))))
 
+(defun semantic-completion-at-point-function ()
+  'semantic-ia-complete-symbol)
+
 ;;; Autoload some functions that are not in semantic/loaddefs
 
 (autoload 'global-semantic-idle-completions-mode "semantic/idle"