diff -r 8531f8af6528 -r 346d6d346f88 .emacs-my
--- a/.emacs-my	Mon Nov 30 12:29:15 2009 +0200
+++ b/.emacs-my	Wed Dec 02 23:45:55 2009 +0200
@@ -419,67 +419,31 @@
 (add-hook 'text-mode-hook 'turn-on-auto-fill)
 
 ;; ----------------------------------------------------------------------
-;; DESIRE
+;; unknown
 
 ;; (require 'desire)
-
 ;; (add-to-list 'desire-load-path
 ;;       (expand-file-name "~/share/emacs/desire"))
 ;; (add-to-list 'auto-mode-alist
 ;;       (cons (concat (regexp-quote desire-extension) "\\'")
 ;;         'emacs-lisp-mode))
 
-;; ----------------------------------------------------------------------
-
-;; Pilot support
-;; (desire 'pilot)
-
-;; ----------------------------------------------------------------------
-
-;; BBDB - Must be loaded before most other things, since other things
-;;        may perform special configuration if BBDB is present.
-;;
-;; (desire 'bbdb "bbdb")
-
-;; ----------------------------------------------------------------------
-
-;; These provide options for the various message handling packages.
 ;; (desire 'browse-url)
 ;; (desire 'mailcrypt)
-
-;; Message handing packages.
 ;; (desire 'gnus)
 ;; (desire 'message)
 ;; (desire 'sendmail)
-
-;; ----------------------------------------------------------------------
-
-;; Miscellaneous
-
-;; (desire 'abbrev)
+;; (desire 'bbdb "bbdb")
+;; (desire 'pilot)
 ;; (desire 'bibtex)
-;; (desire 'calc)
-;; (desire 'ediff)
 ;; (desire 'eiffel-mode)
 ;; (desire 'emacs-w3m)
 ;; (desire 'eudc)
 ;; (desire 'filladapt)
 ;;;; (desire 'hugs-mode)
-;; (desire 'haskell-mode)
-;; (desire 'latex)
-;; (desire 'lispdir)
 ;; (desire 'mpg123)
 ;; (desire 'php-mode)
 ;; (desire 'ps-print)
-;; (desire 'sh-script)
-;; (desire 'shell)
-;; (desire 'tex)
-;; (desire 'w3)
-
-;; ======================================================================
-;;
-;; PERSONAL
-
 ;; (require 'chord-mode)  ; edit guitar music.
 ;; (require 'discography) ; variant of BibTeX mode for discographies.
 
@@ -576,42 +540,21 @@
 (setq woman-fill-frame t)
 
 ;; ======================================================================
-;;
-;; SHELL
-
-;; If you plan to use the bash shell, add the following lines to your .emacs file:
-;; (setq binary-process-input t)
-;; (setq w32-quote-process-args ?\")
-;; (setq shell-file-name "bash") ;; or sh if you rename your bash executable to sh.
-;; (setenv "SHELL" shell-file-name)
-;; (setq explicit-shell-file-name shell-file-name)
-;; (setq explicit-sh-args '("-login" "-i"))
-
-;; Include the following only if you want to run
-;; bash as your shell.
+;; shell, sh, bash
 
 ;; Setup Emacs to run bash as its primary shell.
+;; (setq binary-process-input t)
 ;; (setq shell-file-name "bash")
 ;; (setq shell-command-switch "-c")
-;; (setq explicit-shell-file-name shell-file-name)
 ;; (setenv "SHELL" shell-file-name)
-;; (setq explicit-sh-args '("-login" "-i"))
-;; (if (boundp 'w32-quote-process-args)
-;;     (setq w32-quote-process-args ?\")) ;; Include only for MS Windows.
 
-;; (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")))
-
-(when (provide 'bat-mode)
-  (progn
-    (add-to-list 'auto-mode-alist '("\\.[bB][aA][tT]\\'" . bat-mode))
-    (add-to-list 'auto-mode-alist '("\\.[cC][mM][dD]\\'" . bat-mode))
-    ))
+(when (eq window-system 'w32)
+  (setq explicit-shell-file-name "bash")
+  (setq explicit-bash-args '("-login" "-i"))
+  (setq explicit-sh-args '("-login" "-i")) )
 
 ;; ======================================================================
-;;
-;; Spell
+;; spell, ispall, aspell
 
 (setq ispell-program-name "ispell")
 ;(setq ispell-dictionary "russianw"); default dictionary
@@ -797,7 +740,7 @@
   )
 
 ;; ======================================================================
-;; Devel, prog
+;; devel, prog, programming
 
 (add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
 
@@ -874,7 +817,7 @@
 ;; (add-hook 'asm-mode-hook '(lambda () (local-set-key ":" ":")))
 
 ;; ----------------------------------------------------------------------
-;; LISP
+;; lisp
 (setq list-command-history-max 256)
 
 ;; ----------------------------------------------------------------------
@@ -936,8 +879,17 @@
 (setq c-default-style '((java-mode . "my") (c-mode . "my") (csharp-mode . "my") (c++-mode . "my") (objc-mode . "my") (other . "my")))
 
 ;; ----------------------------------------------------------------------
+;; bat file, batch
+
+(when (provide 'bat-mode)
+  (progn
+    (add-to-list 'auto-mode-alist '("\\.[bB][aA][tT]\\'" . bat-mode))
+    (add-to-list 'auto-mode-alist '("\\.[cC][mM][dD]\\'" . bat-mode))
+    ))
+
+;; ----------------------------------------------------------------------
 ;; *csharp*, c-sharp
-;;
+
 (autoload 'csharp-mode "csharp-mode" "Major mode for editing C# code." t)
 (add-to-list 'auto-mode-alist '("\\.cs$" . csharp-mode))