--- a/.emacs-my	Sun Apr 21 16:32:08 2013 +0300
+++ b/.emacs-my	Tue May 14 19:44:11 2013 +0300
@@ -1347,6 +1347,17 @@
 
 (setq org-agenda-include-diary t)
 
+(defun my-org-kill-by-tag (tag)
+  "Put all entries that matches TAG from current org-file to `kill-ring'."
+  (interactive (list (completing-read "Enter tag: " (org-get-buffer-tags))))
+  (kill-new "")
+  (org-scan-tags
+   (lambda ()
+     (let ( (last-command 'kill-region) )
+       (org-cut-subtree)))
+   '(member tag tags-list)
+   nil) )
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "TODO, XXX, FIXME highlight")
 ;; Show blanks and FIXME
@@ -2100,8 +2111,7 @@
 (unless (featurep 'cedet)
   (when (or
          (and (= emacs-major-version 23) (>= emacs-minor-version 2))
-         (>= emacs-minor-version 24)
-         )
+         (>= emacs-major-version 24) )
     (semantic-mode 1)
     ) )
 
@@ -2109,16 +2119,18 @@
   (global-srecode-minor-mode 1))
 
 (when (featurep 'cedet)
-  (global-ede-mode t)
+  (global-semantic-idle-scheduler-mode 1)
   (global-semantic-idle-summary-mode 1)
-  (global-semantic-idle-scheduler-mode 1)
-  (setq semantic-idle-scheduler-idle-time 1) ; 1 sec.
+  (global-semantic-idle-completions-mode 1)
   (global-semantic-decoration-mode 1)
   (global-semantic-mru-bookmark-mode 1)
   ;; (setq semantic-stickyfunc-sticky-classes '(function type variable include package))
   (global-semantic-stickyfunc-mode -1)
-  (global-semantic-idle-completions-mode -1)
-
+  (global-semantic-highlight-func-mode 1)
+  (global-semantic-decoration-mode 1)
+  (global-semantic-idle-local-symbol-highlight-mode 1)
+
+  (setq semantic-idle-scheduler-idle-time 1)
   (setq semantic-idle-scheduler-work-idle-time 60)
   ;; (setq semantic-idle-work-parse-neighboring-files-flag nil)
 
@@ -2130,6 +2142,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)
+
+  ;; (require 'semantic/db-javap)
+
   ;; (add-to-list 'ede-locate-setup-options 'ede-locate-idutils)
   ;; (add-to-list 'ede-locate-setup-options 'ede-locate-global)
 
@@ -2139,10 +2155,17 @@
   ;;   (semanticdb-enable-gnu-global-databases 'c++-mode)
   ;;   )
 
-  (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)
-  (global-set-key (kbd "C-c , c") 'semantic-ia-complete-symbol-menu)
+  (defun my-c-mode-cedet-hook ()
+    (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)
+
+  ;; (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)
+  ;; (global-set-key (kbd "C-c , c") 'semantic-ia-complete-symbol-menu)
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2505,6 +2528,8 @@
 (setq nxml-attribute-indent 4)
 
 (add-to-list 'auto-mode-alist '("\.pom\\'" . nxml-mode))
+(add-to-list 'auto-mode-alist '("\.xsd\\'" . nxml-mode))
+(add-to-list 'auto-mode-alist '("\.rng\\'" . nxml-mode))
 
 (eval-after-load 'nxml-mode '(define-key nxml-mode-map [C-return] 'nxml-complete))