emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix +workspaces-switch-project-function not respecting dir local vars

Browse source
This commit is contained in:
Henrik Lissner 2020-03-10 01:45:47 -04:00
parent 05689fe76d
commit 031dc5eb1d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ui/workspaces/autoload/workspaces.el
View file

@ -526,12 +526,13 @@ This be hooked to `projectile-after-switch-project-hook'."
(when dir (when dir
(setq +workspaces--project-dir dir)) (setq +workspaces--project-dir dir))
(when (and persp-mode +workspaces--project-dir) (when (and persp-mode +workspaces--project-dir)
(when projectile-before-switch-project-hook
(with-temp-buffer (with-temp-buffer
;; Load the project dir-local variables into the switch buffer, so the ;; Load the project dir-local variables into the switch buffer, so the
;; action can make use of them ;; action can make use of them
(setq default-directory +workspaces--project-dir) (setq default-directory +workspaces--project-dir)
(hack-dir-local-variables-non-file-buffer) (hack-dir-local-variables-non-file-buffer)
(run-hooks 'projectile-before-switch-project-hook)) (run-hooks 'projectile-before-switch-project-hook)))
(unwind-protect (unwind-protect
(if (and (not (null +workspaces-on-switch-project-behavior)) (if (and (not (null +workspaces-on-switch-project-behavior))
(or (eq +workspaces-on-switch-project-behavior t) (or (eq +workspaces-on-switch-project-behavior t)
@ -552,6 +553,7 @@ This be hooked to `projectile-after-switch-project-hook'."
'success)) 'success))
(with-current-buffer (doom-fallback-buffer) (with-current-buffer (doom-fallback-buffer)
(setq default-directory +workspaces--project-dir) (setq default-directory +workspaces--project-dir)
(hack-dir-local-variables-non-file-buffer)
(message "Switched to '%s'" (doom-project-name +workspaces--project-dir))) (message "Switched to '%s'" (doom-project-name +workspaces--project-dir)))
(with-demoted-errors "Workspace error: %s" (with-demoted-errors "Workspace error: %s"
(+workspace-rename (+workspace-current-name) (doom-project-name +workspaces--project-dir))) (+workspace-rename (+workspace-current-name) (doom-project-name +workspaces--project-dir)))