From 48c9936f8d672a7cb116fa81fa94fa17dbd09fa2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 16 Jun 2018 21:04:20 +0200 Subject: [PATCH] Fix eshell buffers omitted from workspace buffers The mode was set before the window was displayed, which is where persp-mode's check is. --- modules/emacs/eshell/autoload/eshell.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/emacs/eshell/autoload/eshell.el b/modules/emacs/eshell/autoload/eshell.el index edd2f7ad0..e89508c0a 100644 --- a/modules/emacs/eshell/autoload/eshell.el +++ b/modules/emacs/eshell/autoload/eshell.el @@ -79,10 +79,10 @@ "Open eshell in the current buffer." (interactive) (let ((buf (+eshell--buffer (eq major-mode 'eshell-mode)))) - (switch-to-buffer buf) - (+eshell--set-window (get-buffer-window buf) t) (with-current-buffer buf (unless (eq major-mode 'eshell-mode) (eshell-mode))) + (switch-to-buffer buf) + (+eshell--set-window (get-buffer-window buf) t) (when command (+eshell-run-command command))))