--- a/.emacs-my	Mon Mar 10 22:14:13 2014 +0200
+++ b/.emacs-my	Mon Mar 10 22:52:06 2014 +0200
@@ -2285,32 +2285,41 @@
   (global-srecode-minor-mode 1)
   (add-hook 'prog-mode-hook 'srecode-minor-mode)
 
+  (ignore-errors
+    (cedet-ectag-version-check)
+    (semantic-load-enable-primary-ectags-support))
+  (ignore-errors
+    (require 'cedet-global)
+    (semanticdb-enable-gnu-global-databases 'c-mode)
+    (semanticdb-enable-gnu-global-databases 'c++-mode))
+
   ;; (require 'semantic/db-javap)
 
   ;; (add-to-list 'ede-locate-setup-options 'ede-locate-idutils)
   ;; (add-to-list 'ede-locate-setup-options 'ede-locate-global)
 
   ;; (ignore-errors (require 'cedet-idutils))
-  ;; (when (ignore-errors (require 'cedet-global))
-  ;;   (semanticdb-enable-gnu-global-databases 'c-mode)
-  ;;   (semanticdb-enable-gnu-global-databases 'c++-mode)
-  ;;   )
 
   (defun my-c-mode-cedet-hook ()
-    (local-set-key [C-return] 'semantic-complete-symbol)
+    ;; (local-set-key [C-return] 'semantic-complete-symbol)
     ;; (local-set-key [C-return] 'semantic-complete-analyze-inline)
     (local-set-key "." 'semantic-complete-self-insert)
     (local-set-key ">" 'semantic-complete-self-insert))
   (add-hook 'c-mode-common-hook 'my-c-mode-cedet-hook)
-  )
-
-(ignore-errors (require 'semantic/ia))
-(when (featurep 'semantic/ia)
-  (define-key semantic-mode-map (kbd "C-c , .") 'semantic-ia-fast-jump)
-  (define-key semantic-mode-map (kbd "C-c , d") 'semantic-ia-show-doc)
-  (define-key semantic-mode-map (kbd "C-c , D") 'semantic-ia-show-summary)
-  (define-key semantic-mode-map (kbd "C-c , ?") 'semantic-ia-complete-symbol-menu)
-  ;; (define-key semantic-mode-map (kbd "C-c , C") 'semantic-ia-describe-class)
+
+  (ignore-errors
+    (require 'semantic/ia)
+    (define-key semantic-mode-map (kbd "C-c , .") 'semantic-ia-fast-jump)
+    (define-key semantic-mode-map (kbd "C-c , d") 'semantic-ia-show-doc)
+    (define-key semantic-mode-map (kbd "C-c , D") 'semantic-ia-show-summary)
+    (define-key semantic-mode-map (kbd "C-c , ?") 'semantic-ia-complete-symbol-menu)
+    (define-key semantic-mode-map [(control return)] 'semantic-ia-complete-symbol)
+    ;; (define-key semantic-mode-map (kbd "C-c , C") 'semantic-ia-describe-class)
+    ;; semantic-decoration-include-visit
+    ;; semantic-analyze-proto-impl-toggle
+    )
+
+  ;; END OF: (when (featurep 'cedet) ...)
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;