Fix #4208: aborting direnv shouldn't abort find-file

2020-11-11 20:33:27 -05:00 · 2020-11-11 20:33:27 -05:00 · f7293fb67e
commit f7293fb67e
parent 1d766bf873
1 changed files with 3 additions and 1 deletions
--- a/modules/tools/direnv/config.el
+++ b/modules/tools/direnv/config.el
@ -26,7 +26,9 @@
      (unless (or envrc-mode
                  (minibufferp)
                  (file-remote-p default-directory))
-        (envrc-mode 1))))
+        (condition-case _
+            (envrc-mode 1)
+          (quit)))))

  ;; Ensure these local variables survive major mode changes, so envrc-mode is
  ;; only "activated" once per buffer.