diff lisp/cedet/semantic.el @ 108166:15deb8699a13

* 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.

--- a/lisp/cedet/semantic.el	Thu Apr 29 14:48:32 2010 +0000
+++ b/lisp/cedet/semantic.el	Thu Apr 29 11:32:11 2010 -0400
@@ -1083,7 +1083,8 @@
 	;; 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-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 @@
       (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"