From 9d45b1a908405909910b333bb89fefc86e5e1f80 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 9 Oct 2020 10:23:27 +0100 Subject: [PATCH] fix(lang): ensure golang setup works with goenv --- core/siren-core-env.el | 1 - modules/languages/siren-golang.el | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/siren-core-env.el b/core/siren-core-env.el index a66f72b..0907ede 100644 --- a/core/siren-core-env.el +++ b/core/siren-core-env.el @@ -12,7 +12,6 @@ (exec-path-from-shell-variables '("PATH" "MANPATH" "TMPDIR" - "GOPATH" "KUBECONFIG")) (exec-path-from-shell-arguments '("-l")) (exec-path-from-shell-check-startup-files nil) diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index 5125201..55075ac 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -50,10 +50,10 @@ (subword-mode +1)) :config - (message "loading go-mode") - - (when (memq window-system '(mac ns)) + (when (not (getenv "GOPATH")) (exec-path-from-shell-copy-env "GOPATH")) + (when (not (getenv "GOENV_GOPATH_PREFIX")) + (exec-path-from-shell-copy-env "GOENV_GOPATH_PREFIX")) (define-key 'help-command (kbd "G") 'godoc)