# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1284532885 -10800
# Node ID 1334dc79ea80b6f44a03bcb5f67c93a62c235d68
# Parent  1d59b8a9d8a0c35d55d517d77dea310e3aad0a8f# Parent  8cd8246b5c5fccb24091d498e564f46ceec5664e
Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs

diff -r 1d59b8a9d8a0 -r 1334dc79ea80 .emacs-my
--- a/.emacs-my	Tue Sep 14 23:14:43 2010 +0300
+++ b/.emacs-my	Wed Sep 15 09:41:25 2010 +0300
@@ -1061,9 +1061,12 @@
       )
     (when (cedet-gnu-global-version-check t)
       (add-to-list 'ede-locate-setup-options 'ede-locate-global)
+      (semanticdb-enable-gnu-global-databases 'c-mode)
+      (semanticdb-enable-gnu-global-databases 'c++-mode)
       )
     )
 
+  (require 'semantic-ia)
   (global-set-key (kbd "C-c , .") 'semantic-ia-fast-jump)
   (global-set-key (kbd "C-c , d") 'semantic-ia-show-doc)
   (global-set-key (kbd "C-c , D") 'semantic-ia-describe-class)