From e74800b5cbc01dd59e8cfdb03d27a56cc66bc914 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 27 Feb 2021 23:33:00 +0000 Subject: [PATCH] fix(lang): ensure Go related env vars are correctly loaded --- core/siren-core-env.el | 8 +++++++- modules/languages/siren-golang.el | 11 ----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/core/siren-core-env.el b/core/siren-core-env.el index 0907ede..9ef2ccc 100644 --- a/core/siren-core-env.el +++ b/core/siren-core-env.el @@ -12,7 +12,13 @@ (exec-path-from-shell-variables '("PATH" "MANPATH" "TMPDIR" - "KUBECONFIG")) + "KUBECONFIG" + "GOPATH" + "GOBIN" + "GOROOT" + "GOPRIVATE" + "GOENV_GOPATH_PREFIX" + "GOENV_VERSION")) (exec-path-from-shell-arguments '("-l")) (exec-path-from-shell-check-startup-files nil) (exec-path-from-shell-debug nil) diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index 9227fe5..581fd39 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -51,17 +51,6 @@ (subword-mode +1)) :config - (when (not (getenv "GOPATH")) - (exec-path-from-shell-copy-env "GOPATH")) - (when (not (getenv "GOBIN")) - (exec-path-from-shell-copy-env "GOBIN")) - (when (not (getenv "GOROOT")) - (exec-path-from-shell-copy-env "GOROOT")) - (when (not (getenv "GOPRIVATE")) - (exec-path-from-shell-copy-env "GOPRIVATE")) - (when (not (getenv "GOENV_GOPATH_PREFIX")) - (exec-path-from-shell-copy-env "GOENV_GOPATH_PREFIX")) - (define-key 'help-command (kbd "G") 'godoc) ;; Ignore go test -c output files