# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1352959747 -7200
# Node ID 2c0d89ce4e8bd2ea91cee6e920c3525a64b50595
# Parent  9d2f14f723c43e160c0f7ccb938d49181b91e240# Parent  28255ceefe52d5901a768d3f6cb4982f2561bee6
merged

diff -r 28255ceefe52 -r 2c0d89ce4e8b .emacs-my
--- a/.emacs-my	Wed Nov 14 10:57:10 2012 +0200
+++ b/.emacs-my	Thu Nov 15 08:09:07 2012 +0200
@@ -2085,9 +2085,9 @@
 (message "imenu")
 
 (defun my-imenu-to-menubar ()
-  (imenu-add-menubar-index)
-  (run-hooks 'menu-bar-update-hook)
-  )
+  (when imenu-generic-expression
+    (imenu-add-menubar-index)
+    (run-hooks 'menu-bar-update-hook) ))
 
 (require 'imenu)
 (mapc (lambda (hook) (add-hook hook 'my-imenu-to-menubar))
@@ -2421,11 +2421,12 @@
 
 (add-to-list 'auto-mode-alist '("\.pom\\'" . nxml-mode))
 
-(eval-after-load 'rng-loc
-  '(progn
-     (add-to-list 'rng-schema-locating-files "~/.emacs.d/rnc/schemas.xml")
-     (define-key nxml-mode-map [C-return] 'nxml-complete)
-     ))
+(eval-after-load 'nxml-mode '(define-key nxml-mode-map [C-return] 'nxml-complete))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "relax ng, rng")
+
+(eval-after-load 'rng-loc '(add-to-list 'rng-schema-locating-files "~/.emacs.d/rnc/schemas.xml"))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "psgml")