 )
 
 ;-----------------shell mode---------------
-(autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t)
-(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on t)
-
+;(autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t)
+;(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on t)
+
+;--------------sh-mode-------------
+(setq
+ sh-indent-for-then 0
+ sh-indent-for-do 0
+ sh-indent-for-after-do '+
+ sh-indent-for-case-label '*
+ sh-indent-for-case-alt '+
+ sh-indent-comment t)
 ;-------------------compile mode------------------
 (add-hook 'java-mode-hook
-          (lambda()
+          (lambda(); javac or ant
             (set (make-local-variable 'compile-command) (concat "javac " (buffer-name)))))
 ; safe locals
 ; we mark these as 'safe', so emacs22+ won't give us annoying warnings
-;(setq safe-local-variable-values
-;      (quote ((auto-recompile . t)
-;              (folding-mode . t)
-;              (outline-minor-mode . t)
-;              auto-recompile outline-minor-mode)))
+(setq safe-local-variable-values
+      (quote ((auto-recompile . t)
+              (folding-mode . t)
+              (outline-minor-mode . t)
+              (sh-indent-comment . t)
+              auto-recompile outline-minor-mode sh-indent-comment
+              )
+             )
+      )

    (menu-bar-lines . 1)
    (width . 80)
;    (height . 58)
    (font . "Monaco")
    )
)


      transient-mark-mode t
      color-theme-is-global t
      delete-by-moving-to-trash t
;      shift-select-mode nil
      truncate-partial-width-windows nil
      uniquify-buffer-name-style 'forward
      whitespace-style '(trailing lines space-before-tab
