# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1416437528 -7200
# Node ID c7faddfb54ae76e98dfa9298d41ae988ceff9d53
# Parent  1f2b829bd3e6f428a8ce3146f53e0b16e7cfd9ec# Parent  489a962e1bd38eccce86c0620dbc0a4f8d55f04a
merged

diff -r 1f2b829bd3e6 -r c7faddfb54ae .emacs-my
--- a/.emacs-my	Fri Nov 14 01:43:48 2014 +0200
+++ b/.emacs-my	Thu Nov 20 00:52:08 2014 +0200
@@ -2293,7 +2293,6 @@
 
 (when (featurep 'cedet)
   (require 'semantic)
-  (semantic-mode 1)
 
   (global-semantic-idle-scheduler-mode 1)
   (global-semantic-idle-summary-mode 1)
@@ -2305,7 +2304,7 @@
   (global-semantic-decoration-mode 1)
   (global-semantic-idle-local-symbol-highlight-mode 1)
 
-  (setq semantic-idle-scheduler-idle-time 1)
+  (setq semantic-idle-scheduler-idle-time 10)
   (setq semantic-idle-scheduler-work-idle-time 60)
   (setq semantic-idle-scheduler-max-buffer-size 100000)
   ;; (setq semantic-idle-work-parse-neighboring-files-flag nil)
@@ -2318,7 +2317,10 @@
   (add-hook 'c-mode-hook (lambda nil (semantic-add-system-include "~/.emacs.d/include" 'c++-mode)))
   (global-semanticdb-minor-mode 1)
 
-  (global-ede-mode t)
+  (global-cedet-m3-minor-mode 1)
+
+  (semantic-mode 1)
+  (global-ede-mode 1)
 
   (require 'srecode)
   (unless (boundp 'srecode-map-load-path)