 ;; - 设置shell的颜色
 
 (load "init-color-face.el")
+;; Change the default shell from cmd.exe to cygwin
 ;; (setq shell-file-name "C:/cygwin/bin/zsh.exe")
 ;; "C:/cygwin/bin/zsh.exe")
+(setq explicit-shell-file-name "C:/cygwin/bin/zsh.exe")
+(setq shell-file-name "zsh")
+;; (setq explicit-bash.exe-args '("--noediting" "--login" "-i"))
+(setenv "SHELL" shell-file-name)
+;; remove the input Ctrl-M character
+(add-hook 'comint-output-filter-functions 'comint-strip-ctrl-m)
+(add-to-list 'process-coding-system-alist
+			 '("zsh" . (undecided-dos . undecided-unix)))
+
+
 (autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t) 
 (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on t)
 ;; ========================================================

			 '("org" . "http://orgmode.org/elpa/") t)


;; ===================================================================
;; 设置个人信息
(setq user-full-name "Cui Yidong")

;; lisp/init 目录存放各种功能的初始化代码
(add-to-list 'load-path (concat basicPath "lisp/init"))
;;(add-to-list 'load-path "~/.emacs.d")

;; ===================================================================
;; 以下是关于org模式初始化的相关路径。具体使用请参见 lisp/init/init-org.el
