--- a/.emacs	Thu Apr 17 23:21:32 2008 +0300
+++ b/.emacs	Thu Apr 17 23:55:33 2008 +0300
@@ -116,7 +116,7 @@
 
 ;; ----------------------------------------------------------------------
 ;;* Line
-(if (not (equal window-system 'nil))
+(if window-system
     (progn
       (global-hl-line-mode t)
       (custom-set-faces '(hl-line ((t (:inherit highlight :background "light yellow")))))
@@ -548,6 +548,15 @@
 ;; (setq sh-shell-file "D:\\home\\cygwin\\bin\\sh.exe")
 ;; (setq sh-shell-arg (quote ((bash) (csh . "-f") (pdksh) (ksh88) (rc . "-p") (wksh) (zsh . "-f") (sh . "-i"))))
 (setq explicit-bash-args (quote ("-login" "-i")))
+
+(setq auto-mode-alist
+      (append
+       (list (cons "\\.[bB][aA][tT]$" 'bat-mode))
+       ;; For DOS init files
+       (list (cons "CONFIG\\."   'bat-mode))
+       (list (cons "AUTOEXEC\\." 'bat-mode))
+       auto-mode-alist))
+
 (if (equal window-system 'w32)
     (require 'bat-mode))
 
@@ -579,6 +588,8 @@
 ;; (setq-default vc-svn-register-switches "--encoding cp1251")
 (setq-default vc-svn-register-switches nil)
 
+(require 'mercurial)
+
 ;; ======================================================================
 ;;* Devel, prog