Merge branch 'develop' into eshell-improvements

modules/term/eshell/autoload/eshell.el

@@ -21,13 +21,15 @@
     t))
 
 (defun +eshell--bury-buffer (&optional dedicated-p)
-  (unless (switch-to-prev-buffer nil 'bury)
-    (switch-to-buffer (doom-fallback-buffer)))
-  (when (eq major-mode 'eshell-mode)
-    (switch-to-buffer (doom-fallback-buffer)))
-  (when +eshell-enable-new-shell-on-split
-    (when-let (win (get-buffer-window (+eshell/here)))
-      (set-window-dedicated-p win dedicated-p))))
+  (let ((directory default-directory))
+    (unless (switch-to-prev-buffer nil 'bury)
+      (switch-to-buffer (doom-fallback-buffer)))
+    (when (eq major-mode 'eshell-mode)
+      (switch-to-buffer (doom-fallback-buffer)))
+    (when +eshell-enable-new-shell-on-split
+      (let ((default-directory directory))
+        (when-let (win (get-buffer-window (+eshell/here t)))
+          (set-window-dedicated-p win dedicated-p))))))
 
 (defun +eshell--setup-window (window &optional flag)
   (when (window-live-p window)

modules/term/eshell/config.el

@@ -187,9 +187,8 @@ You should use `set-eshell-alias!' to change this.")
   ;;      installed for bash completion to work. How frustrating. This way we
   ;;      can at least get bash completion whether or not fish is present.
   (defadvice! +eshell--fallback-to-bash-a (&rest _)
-    :before-while #'fish-completion--list-completions-with-desc
-    (executable-find "fish")))
-
+    :before-until #'fish-completion--list-completions-with-desc
+    (unless (executable-find "fish") "")))
 
 ;; Activate eshell-did-you-mean using its setup function (lazily)
 (use-package! eshell-did-you-mean
@@ -200,4 +199,4 @@ You should use `set-eshell-alias!' to change this.")
   ;;      work on first invocation, so we invoke it once manually by setting
   ;;      the last command and then calling the output filter.
   (setq eshell-last-command-name "catt")
-  (eshell-did-you-mean-output-filter "catt: command not found"))
+  (eshell-did-you-mean-output-filter "catt: command not found"))