Cleanup Eshell to rely less on dynamic scoping.

[bpt/emacs.git] / lisp / eshell / eshell.el

diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 9bdf8b3..e3f8f0d 100644 (file)
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -300,7 +300,7 @@ buffer selected (or created)."
                    (get-buffer-create eshell-buffer-name)))))
     (cl-assert (and buf (buffer-live-p buf)))
     (pop-to-buffer-same-window buf)
-    (unless (eq major-mode 'eshell-mode)
+    (unless (derived-mode-p 'eshell-mode)
       (eshell-mode))
     buf))