equal
deleted
inserted
replaced
559 ;; (setq shell-command-switch "-c") |
559 ;; (setq shell-command-switch "-c") |
560 ;; (setenv "SHELL" shell-file-name) |
560 ;; (setenv "SHELL" shell-file-name) |
561 |
561 |
562 (when (eq window-system 'w32) ; may require Cygwin or MSYS |
562 (when (eq window-system 'w32) ; may require Cygwin or MSYS |
563 (setenv "ESHELL" "bash") |
563 (setenv "ESHELL" "bash") |
|
564 ;; Restore shell name if user set SHELL env var for Cygwin/MSYS. |
|
565 (setq shell-file-name (concat exec-directory "cmdproxy.exe")) |
564 ;; (setq explicit-shell-file-name "bash") |
566 ;; (setq explicit-shell-file-name "bash") |
565 ;; (setq shell-file-name "bash") |
567 ;; (setq shell-file-name "bash") |
566 (setq explicit-bash-args '("-i")) |
568 (setq explicit-bash-args '("-i")) |
567 (setq explicit-sh-args '("-i")) |
569 (setq explicit-sh-args '("-i")) |
568 ;; Here is workaround: when explicit-shell-file-name is "bash" and shell-file-name is "cmdproxy.exe" |
570 ;; Here is workaround: when explicit-shell-file-name is "bash" and shell-file-name is "cmdproxy.exe" |