From 45fb33f11e151000fa13b018629ad764ecc45e2e Mon Sep 17 00:00:00 2001 From: Drew Short Date: Sun, 8 May 2016 23:47:58 -0500 Subject: [PATCH] Disabled the Windows config Windows configuration was causing issues. Looking into how to get magit to play nicely without dealing in trying to slave msys zsh to my emacs session. Windows makes this stuff too complicated sometimes. --- home/.emacs.d/init.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el index dc88a33..17143d9 100644 --- a/home/.emacs.d/init.el +++ b/home/.emacs.d/init.el @@ -127,21 +127,21 @@ (defun windows-config () ;; When running in Windows, we want to use an alternate shell so we ;; can be more unixy. - (setq shell-file-name "c:/Tools/msys64/usr/bin/zsh") - (setq explicit-shell-file-name shell-file-name) - (setq explicit-zsh-args '("--login" "-i")) ; Make sure the shell is in the home - (setenv "HOME" "c:/tools/msys64/home/neria") ; Set the home environment correctly - (setenv "PATH" - (concat ".:/usr/local/bin:/msys64/bin:/bin:" - (replace-regexp-in-string " " "\\\\ " - (replace-regexp-in-string "\\\\" "/" - (replace-regexp-in-string "\\([A-Za-z]\\):" "/\\1" - (getenv "PATH"))))))) + ;(setq shell-file-name "c:/Tools/msys64/usr/bin/zsh") + ;(setq explicit-shell-file-name shell-file-name) + ;(setq explicit-zsh-args '("-i")) ; Make sure the shell is in the home + ;(setenv "HOME" "c:/tools/msys64/home/neria")) ; Set the home environment correctly + ;(setenv "PATH" + ;(concat ".:/usr/local/bin:/msys64/bin:/bin:" + ;(replace-regexp-in-string "/////" "\\\\ " + ;(replace-regexp-in-string "\\\\" "/" + ;(replace-regexp-in-string "\\([A-Za-z]\\):" "/\\1" + ;(getenv "PATH"))))))) ;; Windows specific configurations -; (cond -; ((string-equal system-type "windows-nt") ; MS Windows System -; (windows-config))) +;(cond + ;((string-equal system-type "windows-nt") ; MS Windows System + ;(windows-config))) (custom-set-variables ;; custom-set-variables was added by Custom.