diff options
| author | EuAndreh <eu@euandre.org> | 2018-06-19 16:25:41 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2018-06-19 16:25:41 -0300 |
| commit | cd68b628134c73ad37b4f0456b8ab541842164b8 (patch) | |
| tree | 88740225219e034c676e5166fa1ddffcea329229 | |
| parent | Remove deprecated layers (diff) | |
| download | dotfiles-cd68b628134c73ad37b4f0456b8ab541842164b8.tar.gz dotfiles-cd68b628134c73ad37b4f0456b8ab541842164b8.tar.xz | |
Require exec-path-from-shell
| -rw-r--r-- | spacemacs.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/spacemacs.el b/spacemacs.el index b3c6c6e..5c40167 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -631,13 +631,14 @@ This is the place where most of your configurations should be done. Unless it is "." 'spacemacs/jump-to-definition "," 'tide-jump-back) - ;; https://emacs.stackexchange.com/questions/17866/magit-how-to-use-systems-ssh-agent-and-dont-ask-for-password - (exec-path-from-shell-initialize) - (exec-path-from-shell-copy-env "SSH_AGENT_PID") - (exec-path-from-shell-copy-env "SSH_AUTH_SOCK") - - ;; github layer - (exec-path-from-shell-copy-env "EMACS_GITHUB_TOKEN") + ;; https://github.com/nubank/nudev/pull/509 + (when (require 'exec-path-from-shell nil 'noerror) + ;; https://emacs.stackexchange.com/questions/17866/magit-how-to-use-systems-ssh-agent-and-dont-ask-for-password + (exec-path-from-shell-initialize) + (exec-path-from-shell-copy-env "SSH_AGENT_PID") + (exec-path-from-shell-copy-env "SSH_AUTH_SOCK") + ;; github layer + (exec-path-from-shell-copy-env "EMACS_GITHUB_TOKEN")) ;; https://github.com/syl20bnr/spacemacs/issues/774 (unless (file-exists-p (concat spacemacs-cache-directory "undo")) |