org-agenda: Keep default-directory with restriction

2 files changed, 4 insertions, 3 deletions

diff --git a/init.el b/init.el
index 0303079..f144f85 100644
--- a/init.el
+++ b/init.el
@@ -312,7 +312,7 @@
   (after 'org-agenda
     (setq km/org-agenda-file-directory "~/notes/agenda/"
           org-agenda-files (list km/org-agenda-file-directory))
-    (add-hook 'org-agenda-mode-hook #'km/org-agenda-cd-and-read-dir-locals)
+    (add-hook 'org-agenda-finalize-hook #'km/org-agenda-cd-and-read-dir-locals)
     (add-hook 'org-agenda-finalize-hook #'km/org-agenda-store-current-span))
   (after 'ox-md
     (advice-add 'org-md-paragraph :filter-return #'km/org-md-fill-string))
diff --git a/lisp/km-org.el b/lisp/km-org.el
index fcf82ed..5098748 100644
--- a/lisp/km-org.el
+++ b/lisp/km-org.el
@@ -308,8 +308,9 @@ called through the speed command interface."
 
 ;;;###autoload
 (defun km/org-agenda-cd-and-read-dir-locals ()
-  (setq default-directory "~/notes/")
-  (hack-local-variables))
+  (unless (get 'org-agenda-files 'org-restrict)
+    (setq default-directory "~/notes/")
+    (hack-local-variables)))
 
 ;;;###autoload
 (defun km/org-agenda-store-current-span ()